The branch, master has been updated via 07d85d420b86ba8e01a7edd7ed2b8e5d23ad80fb (commit) via 171bd10394199a9b8b9274d1ba5bce81e64f9596 (commit) from aed2e27b3f814c90350be72ec95d5d72e9063057 (commit)
- Log ----------------------------------------------------------------- commit 07d85d420b86ba8e01a7edd7ed2b8e5d23ad80fb Author: Crack piotrprz@gmail.com Date: Thu Sep 2 23:39:26 2010 +0200
remove problematic CSS, it will make overlay of enum/set editor popup to be a bit off in IE6
commit 171bd10394199a9b8b9274d1ba5bce81e64f9596 Author: Crack piotrprz@gmail.com Date: Thu Sep 2 23:34:44 2010 +0200
restore debug code for user preferences (commented out)
-----------------------------------------------------------------------
Summary of changes: libraries/user_preferences.inc.php | 14 ++++++++++++++ themes/original/css/theme_right.css.php | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index e173d55..2aad2e6 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -48,6 +48,20 @@ if (!empty($_GET['saved'])) { $message->display(); }
+/* debug code +$arr = ConfigFile::getInstance()->getConfigArray(); +$arr2 = array(); +foreach ($arr as $k => $v) { + $arr2[] = "<b>$k</b> " . var_export($v, true); +} +$arr2 = implode(', ', $arr2); +$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow']) + ? '<i>empty</i>' + : implode(', ', $cfg['UserprefsDisallow'])); +$msg = PMA_Message::notice('Settings: ' . $arr2); +$msg->display(); +//*/ + // warn about using session storage for settings $cfgRelation = PMA_getRelationsParam(); if (!$cfgRelation['userconfigwork']) { diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index da283ea..c04bedb 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -31,8 +31,6 @@ body { margin: 0.5em; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; - width: 100%; - height: 100%; }
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
hooks/post-receive