Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

More PHP 5.5 fixes found while working on 2.0 PHP 5.5 Combat

Signed-off-by: jdarwood007 <[email protected]>
jdarwood007 10 years ago
parent
3e46fa2644
commit
2f78a8f68c
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      Sources/Post.php
  2. 1 1
      Sources/QueryString.php

+ 1 - 1
Sources/Post.php
View File 

@@ -766,7 +766,7 @@ function Post($post_errors = array())
 
 				{
 
 					// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
 
 					if ($i % 4 == 0)
 
-						$parts[$i] = preg_replace('~\[html\](.+?)\[/html\]~ise', create_function('$m', ' return \'[html]\' . preg_replace(\'~<br\s?/?' . '>~i\', \'&lt;br /&gt;<br />\', \'$m[1]\') . \'[/html]\';'), $parts[$i]);
 
+						$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', create_function('$m', ' return \'[html]\' . preg_replace(\'~<br\s?/?' . '>~i\', \'&lt;br /&gt;<br />\', "$m[1]") . \'[/html]\';'), $parts[$i]);
 
 				}
 
 				$form_message = implode('', $parts);
 
 			}

+ 1 - 1
Sources/QueryString.php
View File 

@@ -617,7 +617,7 @@ function ob_sessrewrite($buffer)
 
 	{
 
 		// Let's do something special for session ids!
 
 		if (defined('SID') && SID != '')
 
-			$buffer = preg_replace_callback('~"' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~e', create_function('$m', 'global $scripturl; return \'"\' . $scripturl . \'/\' . strtr("$m[1]", \'&;=\', \'//,\') . \'.html?\' . SID . (isset($m[2]) ? $m[2] : "");'), $buffer;
 
+			$buffer = preg_replace_callback('~"' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', create_function('$m', 'global $scripturl; return \'"\' . $scripturl . "/" . strtr("$m[1]", \'&;=\', \'//,\') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . \'"\';'), $buffer);
 
 		else
 
 			$buffer = preg_replace_callback('~"' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', create_function('global $scripturl; return \'"\' . $scripturl . \'/\' . strtr("$m[1]" . \'&;=\', \'//,\') . \'.html\' . (isset($m[2]) ? "$m[2]" : "");'), $buffer);
 
 	}