extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-09 15:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

backport of Christian Binders patch: little helper for prefs if unserialize failed - this can happen if the pref comes from an installation with another charset than the current system charset, ported to handle config as well

Browse Source
This commit is contained in:
Klaus Leithoff 2009-11-02 10:52:29 +00:00
parent b350351d40
commit 8a6fc34c88
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.config.inc.php
View File

@ -218,6 +218,11 @@ class config
$value = $row['config_value']; $value = $row['config_value'];
$test = @unserialize($value); $test = @unserialize($value);
if($test === false)
{
// manually retrieve the string lengths of the serialized array if unserialize failed
$test = @unserialize(preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.mb_strlen('$2','8bit').':\"$2\";'", $value));
}
$config[$name] = is_array($test) ? $test : $value; $config[$name] = is_array($test) ? $test : $value;
} }

5
phpgwapi/inc/class.preferences.inc.php
View File

@ -272,6 +272,11 @@ class preferences
// The following replacement is required for PostgreSQL to work // The following replacement is required for PostgreSQL to work
$app = trim($row['preference_app']); $app = trim($row['preference_app']);
$value = unserialize($row['preference_value']); $value = unserialize($row['preference_value']);
if($value === false)
{
// manually retrieve the string lengths of the serialized array if unserialize failed
$value = unserialize(preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.mb_strlen('$2','8bit').':\"$2\";'", $row['preference_value']));
}
$this->unquote($value); $this->unquote($value);
if (!is_array($value)) if (!is_array($value))
{ {