Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

  • Loading branch information...
commit bf5b2bd046833b9914f80b5e2ae081629ee80ccb 2 parents f371ce5 + fdb2daf
@lem9 lem9 authored
View
12 libraries/Config.class.php
@@ -189,11 +189,11 @@ function checkClient()
$this->set('PMA_USR_BROWSER_VER', $log_version[2]);
$this->set('PMA_USR_BROWSER_AGENT', 'OPERA');
} elseif (preg_match(
- '@MSIE ([0-9].[0-9]{1,2})@',
+ '@(MS)?IE ([0-9]{1,2}.[0-9]{1,2})@',
$HTTP_USER_AGENT,
$log_version
)) {
- $this->set('PMA_USR_BROWSER_VER', $log_version[1]);
+ $this->set('PMA_USR_BROWSER_VER', $log_version[2]);
$this->set('PMA_USR_BROWSER_AGENT', 'IE');
} elseif (preg_match(
'@OmniWeb/([0-9].[0-9]{1,2})@',
@@ -242,6 +242,14 @@ function checkClient()
'PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]
);
$this->set('PMA_USR_BROWSER_AGENT', 'SAFARI');
+ // Firefox
+ } elseif (! strstr($HTTP_USER_AGENT, 'compatible')
+ && preg_match('@Firefox/([\w.]+)@', $HTTP_USER_AGENT, $log_version2)
+ ) {
+ $this->set(
+ 'PMA_USR_BROWSER_VER', $log_version2[1]
+ );
+ $this->set('PMA_USR_BROWSER_AGENT', 'FIREFOX');
} elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) {
$this->set('PMA_USR_BROWSER_VER', '1.9');
$this->set('PMA_USR_BROWSER_AGENT', 'GECKO');
View
4 libraries/Header.class.php
@@ -484,7 +484,9 @@ private function _getHtmlStart()
$dir = $GLOBALS['text_dir'];
$retval = "<!DOCTYPE HTML>";
- $retval .= "<html lang='$lang' dir='$dir'>";
+ $retval .= "<html lang='$lang' dir='$dir' class='";
+ $retval .= strtolower(PMA_USR_BROWSER_AGENT) . " ";
+ $retval .= strtolower(PMA_USR_BROWSER_AGENT) . intval(PMA_USR_BROWSER_VER) . "'>";
return $retval;
}
View
18 libraries/navigation/NavigationTree.class.php
@@ -1031,7 +1031,14 @@ private function _fastFilterHtml($node)
$retval .= "<form class='ajax fast_filter'>";
$retval .= PMA_getHiddenFields($url_params);
$retval .= "<input class='searchClause' name='searchClause'";
- $retval .= " value='" . __('filter databases by name') . "' />";
+ // allow html5 placeholder attribute
+ $placeholder_key = 'value';
+ if (PMA_USR_BROWSER_AGENT !== 'IE'
+ || PMA_USR_BROWSER_VER > 9
+ ) {
+ $placeholder_key = 'placeholder';
+ }
+ $retval .= " $placeholder_key='" . __('filter databases by name') . "' />";
$retval .= "<span title='" . __('Clear Fast Filter') . "'>X</span>";
$retval .= "</form>";
$retval .= "</li>";
@@ -1057,7 +1064,14 @@ private function _fastFilterHtml($node)
$retval .= "<form class='ajax fast_filter'>";
$retval .= PMA_getHiddenFields($url_params);
$retval .= "<input class='searchClause' name='searchClause2'";
- $retval .= " value='" . __('filter items by name') . "' />";
+ // allow html5 placeholder attribute
+ $placeholder_key = 'value';
+ if (PMA_USR_BROWSER_AGENT !== 'IE'
+ || PMA_USR_BROWSER_VER > 9
+ ) {
+ $placeholder_key = 'placeholder';
+ }
+ $retval .= " $placeholder_key='" . __('filter items by name') . "' />";
$retval .= "<span title='" . __('Clear Fast Filter') . "'>X</span>";
$retval .= "</form>";
$retval .= "</li>";
View
10 themes/original/css/navigation.css.php
@@ -196,7 +196,7 @@
border-<?php echo $left; ?>: 1px solid #666;
}
li.fast_filter input {
- padding-<?php echo $right; ?>: .4em;
+ padding-<?php echo $right; ?>: 1.7em;
width: 100%;
}
li.fast_filter span {
@@ -207,6 +207,14 @@
font-weight: bold;
color: #800;
}
+/* IE10+ has its own reset X */
+html.ie li.fast_filter span {
+ display: none;
+}
+html.ie.ie9 li.fast_filter span,
+html.ie.ie8 li.fast_filter span {
+ display: auto;
+}
li.fast_filter.db_fast_filter {
border: 0;
}
View
10 themes/pmahomme/css/navigation.css.php
@@ -192,7 +192,7 @@
border-<?php echo $left; ?>: 1px solid #666;
}
li.fast_filter input {
- padding-<?php echo $right; ?>: .4em;
+ padding-<?php echo $right; ?>: 1.7em;
width: 100%;
}
li.fast_filter span {
@@ -203,6 +203,14 @@
font-weight: bold;
color: #800;
}
+/* IE10+ has its own reset X */
+html.ie li.fast_filter span {
+ display: none;
+}
+html.ie.ie9 li.fast_filter span,
+html.ie.ie8 li.fast_filter span {
+ display: auto;
+}
li.fast_filter.db_fast_filter {
border: 0;
}
Please sign in to comment.
Something went wrong with that request. Please try again.