I updated 3.09 to 3.010 a few days ago, and made all the necessary file merge/modifications manually with no problem. The general tab of the ACP recognizes this, and shows my Board Version as 3.010. However, under the systems tab of the ACP, it gives me an error saying that I need to update my version of phpbb to the latest one, thinking its still 3.09. When I go back through the update installation(after restoring the install directory), it repeatedly tells me that the includes/functions file needs the following segment to be modified, claiming there is a difference between the new includes/functions.php file and my own.
$s_search_hidden_fields = array();
foreach ($_EXTRA_URL as $url_param)
I've copied and pasted the modified code it claims is wrong(and saved it, despite it being identical to what was there already), copied and edited it for perfect spacing since copy/paste adds extra rows(and saved it), and even gone in and retyped the entire modified segment from scratch(and saved it). And yet every time I run the files check, it tells me to merge the same modifications, even though they're already there. All other merge modifications have been fully successful.
I've attached a copy of my functions.php file.