Changeset 30457

Timestamp:

Nov 12, 2014, 1:48:50 PM (9 years ago)

Author:

plg

Message:

use conf_update_param instead of custom insert query

Location:

extensions/stripped

Files:

• admin/upgrade.inc.php (modified) (5 diffs)
• themeconf.inc.php (modified) (3 diffs)

extensions/stripped/admin/upgrade.inc.php

@@ -50 +50 @@
         'maxThumb'                                              => 15,
       );
-      
-    $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('stripped' , '".pwg_db_real_escape_string(serialize($config))."' , 'stripped theme parameters');";
 
-    pwg_query($query);
-
+  conf_update_param('stripped', $config, true);
 } else {
         
@@ -83 +78 @@
                 $config['hdSize']='xxlarge';
                   
-                conf_update_param('stripped', pwg_db_real_escape_string(serialize($config)));
+                conf_update_param('stripped', $config, true);
         
         } else {
@@ -99 +94 @@
                         $config['forceLightboxOn']=false;
                           
-                        conf_update_param('stripped', pwg_db_real_escape_string(serialize($config)));
+                        conf_update_param('stripped', $config, true);
                 
                 } else {
@@ -112 +107 @@
                                 $config['HDlightbox']=true;
                                 $config['forceLightboxOn']=false;
-                                conf_update_param('stripped', pwg_db_real_escape_string(serialize($config)));
+                                conf_update_param('stripped', $config, true);
                         }
 
@@ -120 +115 @@
                                 $config['HDlightbox']=true;
                                 $config['forceLightboxOn']=false;
-                                conf_update_param('stripped', pwg_db_real_escape_string(serialize($config)));
+                                conf_update_param('stripped', $config, true);
                         }
                                 

extensions/stripped/themeconf.inc.php

@@ -15 +15 @@
   include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
 
-$stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
+$conf['stripped'] = safe_unserialize($conf['stripped']);
+
+$stripped = array_merge($conf['stripped'], (array)$stripped );
 
 // Need upgrade from v1.x?
 if (!isset($stripped['themeStyle'])) {
         include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
-        $stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
+        $stripped = array_merge($conf['stripped'], (array)$stripped );
 }
 
@@ -26 +28 @@
 if (!isset($stripped['paramVersion'])) {
         include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
-        $stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
+        $stripped = array_merge($conf['stripped'], (array)$stripped );
 }
 
@@ -32 +34 @@
 if ((isset($stripped['paramVersion'])) && ($stripped['paramVersion'] != '2.3')) {
         include(PHPWG_THEMES_PATH.'stripped/admin/upgrade.inc.php');
-        $stripped = array_merge( unserialize( $conf['stripped'] ), (array)$stripped );
+        $stripped = array_merge($conf['stripped'], (array)$stripped );
 }