Changeset 3164:1a44d7eb255e for inc/dbschema

Timestamp:

02/09/16 14:50:49 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Better this way, adresses #1833

File:

• inc/dbschema/upgrade.php (modified) (2 diffs)

inc/dbschema/upgrade.php

@@ -534 +534 @@
           $rs = $core->con->select(sprintf($strReqSelect,$setting,$ns));
           while ($rs->fetch()) {
-               $value = unserialize($rs->setting_value);
+               $value = @unserialize($rs->setting_value);
                if (!$value) {
                     $value = array();
                }
-               $value = json_encode(settype($value,'array'));
+               settype($value,'array');
+               $value = json_encode($value);
                $rs2 = "UPDATE ".$core->prefix."setting ".
                     "SET setting_type='array', setting_value = '".$core->con->escape($value)."' ".
@@ -568 +569 @@
           $rs = $core->con->select(sprintf($strReqSelect,$pref,$ws));
           while ($rs->fetch()) {
-               $value = unserialize($rs->pref_value);
+               $value = @unserialize($rs->pref_value);
                if (!$value) {
                     $value = array();
                }
-               $value = json_encode(settype($value,'array'));
+               settype($value,'array');
+               $value = json_encode($value);
                $rs2 = "UPDATE ".$core->prefix."pref ".
                     "SET pref_type='array', pref_value = '".$core->con->escape($value)."' ".