Changeset 30456

Timestamp:

Nov 12, 2014, 1:41:04 PM (9 years ago)

Author:

plg

Message:

avoid calling load_conf_from_db() which may break some plugin config

Location:

extensions/stripped_black_bloc

Files:

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

extensions/stripped_black_bloc/admin/upgrade.inc.php

@@ -17 +17 @@
   'hover_action'         => 'fadein', //fadein - fadeout - border - none
   );
-  $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('stripped_black_bloc' , '".pwg_db_real_escape_string(serialize($config))."' , 'color_main#column_width#thumbnail_width#catthumb(none - same - all)');";
-  pwg_query($query);
-  load_conf_from_db();
+
+  conf_update_param('stripped_black_bloc', $config, true);
 }
-elseif (count(unserialize( $conf['stripped_black_bloc'] ))!=8)
+elseif (count(safe_unserialize( $conf['stripped_black_bloc'] ))!=8)
 {
-  $conff=unserialize($conf['stripped_black_bloc']);
+  $conff = safe_unserialize($conf['stripped_black_bloc']);
   $config = array(
   'color_main'            => (isset($conff['color_main'])) ? $conff['color_main'] :'E6554F',
@@ -36 +33 @@
   'hover_action'         => (isset($conff['hover_action'])) ? $conff['hover_action'] :'fadein' //fadein - fadeout - border - none
   );
-  conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config)));
-  load_conf_from_db();
+
+  conf_update_param('stripped_black_bloc', $config, true);
 }
 ?>

extensions/stripped_black_bloc/themeconf.inc.php

@@ -36 +36 @@
 {
   global $conf, $template;
-  $config = unserialize( $conf['stripped_black_bloc'] );
+  $config = safe_unserialize( $conf['stripped_black_bloc'] );
   $template->assign( 'stripped_black_bloc', $config );
 }
@@ -58 +58 @@
   }
   
-  $config = unserialize( $conf['stripped_black_bloc'] );
+  $config = safe_unserialize( $conf['stripped_black_bloc'] );
   $template->assign( 'stripped_black_bloc', $config );
   $new_tplvar=array();