I'm patching 4.1.10 with the 4.1.12 (no need to judge, it works fine
Patching the files thought that all but on file was already updated. Which was odd, since they aren't. So I updated manually. All very easy except for one file.
The only file that didn't think it was updated was func.core.php
Which it said "could not patch" so I try to do that manually. We have had some work done, so I'm not amazingly surprised it can't do it automatically.
The first part of the change file is:
@header("Refresh: 0; URL=".$location);
}
- if ($show_note)
- echo "<br /><br />".func_get_langvar_by_name("txt_header_location_n ote", array("time" => 2, "location" => $location), false, true, true);
- echo "<meta http-equiv=\"Refresh\" content=\"0;URL=$location\" />";
however if ($show_note) doesn't exist in the file at all.
I could just insert the + lines into the correct place, replacing the echo lines. But I was a little concerned about the difference.
Any advice?
Also further down in the file I need to look for:
$url = preg_replace('/[\x00-\x1f].*$/sm', '', $url);
and insert:
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Refresh" content="<?php echo $time; ?>;URL=<?php echo str_replace(array('"', "'", '<', '>'), array('"',''', '<', '>'), $url); ?>" />
+</head>
+<body>
+<br /><br />
+<?php
+ echo func_get_langvar_by_name('txt_header_location_note ', array('time' => $time, 'location' => str_replace(array('"', "'", '<', '>'), array('"',''', '<', '>'), ($url))), false, true);
+?>
+</body>
+</html>
+<?php
Which looks really odd to my untrained eye.
Any and all advice as to what that last part is doing, and confirmation that it is correct is most welcome.