mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Closes #3305 Added a backward compatibility fix for buggy array storage data.

Browse Source
This commit is contained in:
Cameron
2018-07-22 10:39:01 -07:00
parent 9697e114b1
commit 262dc7f36b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_handlers/core_functions.php
View File

@@ -420,7 +420,7 @@ class e_array {
* Returns an array from stored array data in php serialized, e107 var_export and json-encoded data. * Returns an array from stored array data in php serialized, e107 var_export and json-encoded data.
* *
* @param string $ArrayData * @param string $ArrayData
* @return array stored data * @return array|bool stored data
*/ */
public function unserialize($ArrayData) public function unserialize($ArrayData)
{ {
@@ -461,12 +461,17 @@ class e_array {
$ArrayData = trim($ArrayData); $ArrayData = trim($ArrayData);
if(strpos($ArrayData, "\$data = ") === 0) // Fix for buggy old value.
{
$ArrayData = substr($ArrayData,8);
}
if(strtolower(substr($ArrayData,0,5)) != 'array') if(strtolower(substr($ArrayData,0,5)) != 'array')
{ {
return false; return false;
} }
if(strpos($ArrayData,"0 => \'")!=false) if(strpos($ArrayData," => \'") !== false)
{ {
$ArrayData = stripslashes($ArrayData); $ArrayData = stripslashes($ArrayData);
} }

8
e107_handlers/e107_class.php
View File

@@ -1751,17 +1751,17 @@ class e107
* Return a string containg exported array data. - preferred. * Return a string containg exported array data. - preferred.
* *
* @param array $ArrayData array to be stored * @param array $ArrayData array to be stored
* @param bool $AddSlashes default false, add slashes for db storage, else false * @param bool|string $mode true = var_export with addedslashes, false = var_export (default), 'json' = json encoded
* @return string * @return array|string
*/ */
public static function serialize($ArrayData, $AddSlashes = false) public static function serialize($ArrayData, $mode = false)
{ {
if(empty($ArrayData)) if(empty($ArrayData))
{ {
return array(); return array();
} }
return self::getArrayStorage()->serialize($ArrayData, $AddSlashes); return self::getArrayStorage()->serialize($ArrayData, $mode);
} }
/** /**