diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 959835c0c..4dd9492f8 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,9 +1 @@
restore cache'ing in phpmyadmin.css.php
-remove debug from user preferences header
-
-
-info about setup script in prefs manage, it seems many people still don't know it exists
-(and maybe some description in docs on making it work with live configuration?)
-
-
-show blacklist (and debug?) on prefs manage page
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 99b31f19a..633b27871 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -48,18 +48,20 @@ if (!empty($_GET['saved'])) {
$message->display();
}
-// todo: debug - remove
-$arr = ConfigFile::getInstance()->getConfigArray();
-$arr2 = array();
-foreach ($arr as $k => $v) {
- $arr2[] = "$k " . var_export($v, true);
+// debug info
+if ($cfg['DBG']['php']) {
+ $arr = ConfigFile::getInstance()->getConfigArray();
+ $arr2 = array();
+ foreach ($arr as $k => $v) {
+ $arr2[] = "$k " . var_export($v, true);
+ }
+ $arr2 = implode(', ', $arr2);
+ $arr2 .= '
Blacklist: ' . (empty($cfg['UserprefsDisallow'])
+ ? 'empty'
+ : implode(', ', $cfg['UserprefsDisallow']));
+ $msg = PMA_Message::notice('Settings: ' . $arr2);
+ $msg->display();
}
-$arr2 = implode(', ', $arr2);
-$arr2 .= '
Blacklist: ' . (empty($cfg['UserprefsDisallow'])
- ? 'empty'
- : implode(', ', $cfg['UserprefsDisallow']));
-$msg = PMA_Message::notice('Debug: ' . $arr2);
-$msg->display();
// warn about using session storage for settings
$cfgRelation = PMA_getRelationsParam();