aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2009-07-31 14:59:31 +0000
committerpatdenice <patdenice@piwigo.org>2009-07-31 14:59:31 +0000
commitf609411ba0ffa916174d8a96c18b0f1d980a40e9 (patch)
treee5f881384b4ad4552738033dec50e6fca3b525d4 /admin
parentde08354729ff5a3b8a547e35f9c8629f30d71432 (diff)
merge r3711 from trunk to branch 2.0
Disable database optimization for menubar order until it has been fixed. git-svn-id: http://piwigo.org/svn/branches/2.0@3712 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/menubar.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/admin/menubar.php b/admin/menubar.php
index 17b90607d..c717cf0da 100644
--- a/admin/menubar.php
+++ b/admin/menubar.php
@@ -99,6 +99,7 @@ if ( isset($_POST['submit']) and !is_adviser() )
make_consecutive( $mb_conf );
// BEGIN OPTIM - DONT ASK ABOUT THIS ALGO - but optimizes the size of the array we save in DB
+ /* !!! OPTIM DISABLED UNTIL IT HAS BEEN FIXED !!!
$reg_keys = array_keys($reg_blocks);
$cnf_keys = array_keys($mb_conf);
$best_slice = array( 'len'=>0 );
@@ -121,7 +122,9 @@ if ( isset($_POST['submit']) and !is_adviser() )
}
}
}
+ */
$mb_conf_db = $mb_conf;
+ /*
if ($best_slice['len'])
{
for ($j=0; $j<$best_slice['start_cnf']; $j++ )
@@ -137,7 +140,7 @@ if ( isset($_POST['submit']) and !is_adviser() )
}
//var_export( $best_slice ); var_export($mb_conf); var_export($mb_conf_db);
// END OPTIM
-
+ */
$query = '
UPDATE '.CONFIG_TABLE.'
SET value="'.addslashes(serialize($mb_conf_db)).'"