Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/514] Use preg_replace_callback in portal

Browse Source 
B3P-514
This commit is contained in:
Marc Alexander
2015-03-20 17:49:01 +01:00
parent 6835979dbf
commit 39482d5441
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/calendar.php
View File

@@ -712,15 +712,17 @@ class calendar extends module_base
} }
/** /**
* Unserialize links array * Unserialize links array
* *
* @param string $serial_str Serialized string * @param string $serial_str Serialized string
* *
* @return array Unserialized array * @return array Unserialized string
*/ */
protected function utf_unserialize($serial_str) private function utf_unserialize($serial_str)
{ {
$out = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $serial_str ); $out = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($result) {
return 's:' . strlen($result[2]) . ":\"{$result[2]}\";";
}, $serial_str);
return unserialize($out); return unserialize($out);
} }

16
modules/links.php
View File

@@ -462,15 +462,17 @@ class links extends module_base
} }
/** /**
* Unserialize links array * Unserialize links array
* *
* @param string $serial_str Serialized string * @param string $serial_str Serialized string
* *
* @return array Unserialized string * @return array Unserialized string
*/ */
private function utf_unserialize($serial_str) private function utf_unserialize($serial_str)
{ {
$out = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $serial_str); $out = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($result) {
return 's:' . strlen($result[2]) . ":\"{$result[2]}\";";
}, $serial_str);
return unserialize($out); return unserialize($out);
} }
} }

12
modules/main_menu.php
View File

@@ -526,12 +526,12 @@ class main_menu extends module_base
} }
/** /**
* Unserialize links array * Unserialize links array
* *
* @param string $serial_str Serialized string * @param string $serial_str Serialized string
* *
* @return array Unserialized string * @return array Unserialized string
*/ */
private function utf_unserialize($serial_str) private function utf_unserialize($serial_str)
{ {
$out = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($result) { $out = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($result) {