diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e50e440f4..66c36e8f2 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -436,7 +436,7 @@ class PMA_Config
// will have everything avaiable in session cache
$server = isset($GLOBALS['server'])
? $GLOBALS['server']
- : $GLOBALS['cfg']['ServerDefault'];
+ : (!empty($GLOBALS['cfg']['ServerDefault']) ? $GLOBALS['cfg']['ServerDefault'] : 0);
$cache_key = 'server_' . $server;
if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
$config_mtime = max($this->default_source_mtime, $this->source_mtime);
@@ -464,7 +464,6 @@ class PMA_Config
// load config array
$this->settings = PMA_array_merge_recursive($this->settings, $config_data);
$GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
-
if (defined('PMA_MINIMUM_COMMON')) {
return;
}
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index 96fc48bd8..dcdba3190 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -91,7 +91,7 @@ class Form
return array();
}
// convert array('#', 'a', 'b') to array('a', 'b')
- if (isset($value[0]) && $value[0] == '#') {
+ if (isset($value[0]) && $value[0] === '#') {
// remove first element ('#')
array_shift($value);
} else {
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 1c59f4a58..7d60e1056 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -66,10 +66,6 @@ $forms['Left_frame']['Left_frame'] = array(
'LeftLogoLink',
'LeftLogoLinkWindow',
'LeftPointerEnable');
-// pmadb is unavailable when these settings are used
-/*$forms['Left_frame']['Left_servers'] = array(
- 'LeftDisplayServers',
- 'DisplayServersList');*/
$forms['Left_frame']['Left_databases'] = array(
'DisplayDatabasesList',
'LeftFrameDBTree',
@@ -106,7 +102,7 @@ $forms['Main_frame']['Edit'] = array(
'ShowFunctionFields',
'ShowFieldTypesInDataEditView',
'InsertRows',
- 'ForeignKeyDropdownOrder',// [s, ? custom text value]
+ 'ForeignKeyDropdownOrder',
'ForeignKeyMaxLimit',
'CtrlArrowsMoving',
'DefaultPropDisplay');
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 55e799131..46cca27b3 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -53,7 +53,7 @@ if ($GLOBALS['text_dir'] == 'ltr') {
-
+
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 2059c255c..135d8665d 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -613,6 +613,12 @@ ul#topmenu, ul#topmenu2, ul.tabs {
padding: 0;
}
+ul#topmenu2 {
+ margin: 0.25em 0.5em 0;
+ height: 2em;
+ clear: both;
+}
+
ul#topmenu li, ul#topmenu2 li {
float: ;
margin: 0;
@@ -634,33 +640,30 @@ ul#topmenu a, ul#topmenu span {
}
ul#topmenu ul a {
- margin: 0;
- padding-bottom: 0.2em;
+ margin: 0;
+ padding-bottom: 0.2em;
}
ul#topmenu .submenu {
- position: relative;
+ position: relative;
}
ul#topmenu ul {
- padding: 0;
- margin: 0;
- position: absolute;
- right: 0;
- list-style-type: none;
- display: none;
- -moz-box-shadow: 2px 2px 3px #666;
- -webkit-box-shadow: 2px 2px 3px #666;
- box-shadow: 2px 2px 3px #666;
- border: 1px #666 solid;
+ padding: 0;
+ margin: 0;
+ position: absolute;
+ right: 0;
+ list-style-type: none;
+ display: none;
+ border: 1px #666 solid;
}
ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
- display: block;
+ display: block;
}
ul#topmenu ul li {
- width: 100%;
+ width: 100%;
}
ul#topmenu2 a {
@@ -694,16 +697,20 @@ ul#topmenu a.tabcaution:hover {
ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
color: black;
}
+
+ul#topmenu ul {
+ background: ;
+}
#topmenu {
margin-top: 0.5em;
padding: 0.1em 0.3em 0.1em 0.3em;
}
-ul#topmenu2 {
- margin: 0.25em 0.5em 0;
- height: 2em;
- clear: both;
+ul#topmenu ul {
+ -moz-box-shadow: 2px 2px 3px #666;
+ -webkit-box-shadow: 2px 2px 3px #666;
+ box-shadow: 2px 2px 3px #666;
}
ul#topmenu > li {
@@ -712,8 +719,8 @@ ul#topmenu > li {
/* default tab styles */
ul#topmenu a, ul#topmenu span {
- background-color: ;
- border: 0 solid ;
+ background-color: ;
+ border: 0 solid ;
border-width: 1pt 1pt 0 1pt;
-moz-border-radius: 0.4em 0.4em 0 0;
border-radius: 0.4em 0.4em 0 0;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b2a7aa190..8d46acae4 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -588,6 +588,12 @@ ul#topmenu, ul#topmenu2, ul.tabs {
padding: 0;
}
+ul#topmenu2 {
+ margin: 0.25em 0.5em 0;
+ height: 2em;
+ clear: both;
+}
+
ul#topmenu li, ul#topmenu2 li {
float: ;
margin: 0;
@@ -609,33 +615,30 @@ ul#topmenu a, ul#topmenu span {
}
ul#topmenu ul a {
- margin: 0;
- padding-bottom: 0.2em;
+ margin: 0;
+ padding-bottom: 0.2em;
}
ul#topmenu .submenu {
- position: relative;
+ position: relative;
}
ul#topmenu ul {
- margin: 0;
- padding: 0;
- position: absolute;
- right: 0;
- list-style-type: none;
- display: none;
- -moz-box-shadow: 2px 2px 3px #666;
- -webkit-box-shadow: 2px 2px 3px #666;
- box-shadow: 2px 2px 3px #666;
- border: 1px #666 solid;
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ right: 0;
+ list-style-type: none;
+ display: none;
+ border: 1px #666 solid;
}
ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
- display: block;
+ display: block;
}
ul#topmenu ul li {
- width: 100%;
+ width: 100%;
}
ul#topmenu2 a {
@@ -669,16 +672,20 @@ ul#topmenu a.tabcaution:hover {
ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
color: black;
}
+
+ul#topmenu ul {
+ background: ;
+}
#topmenu {
margin-top: 0.5em;
padding: 0.1em 0.3em 0.1em 0.3em;
}
-ul#topmenu2 {
- margin: 0.25em 0.5em 0;
- height: 2em;
- clear: both;
+ul#topmenu ul {
+ -moz-box-shadow: 2px 2px 3px #666;
+ -webkit-box-shadow: 2px 2px 3px #666;
+ box-shadow: 2px 2px 3px #666;
}
ul#topmenu > li {