gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2012-12-07 13:45:29 +01:00
commit 16ea3e478e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/Util.class.php
View File

@ -2346,14 +2346,7 @@ class PMA_Util
/* Opera has trouble with <input type="image"> */
/* IE (before version 9) has trouble with <button> */
if (PMA_USR_BROWSER_AGENT != 'IE'
|| (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER > 8)) {
return '<button class="' . $button_class . '" type="submit"'
.' name="' . $button_name . '" value="' . htmlspecialchars($value)
. '" title="' . htmlspecialchars($text) . '">' . "\n"
. self::getIcon($image, $text)
.'</button>' . "\n";
} else {
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
return '<input type="image" name="' . $image_name
. '" value="' . htmlspecialchars($value)
. '" title="' . htmlspecialchars($text)
@ -2361,6 +2354,12 @@ class PMA_Util
. ($GLOBALS['cfg']['PropertiesIconic'] === 'both'
? '&nbsp;' . htmlspecialchars($text)
: '') . "\n";
} else {
return '<button class="' . $button_class . '" type="submit"'
.' name="' . $button_name . '" value="' . htmlspecialchars($value)
. '" title="' . htmlspecialchars($text) . '">' . "\n"
. self::getIcon($image, $text)
.'</button>' . "\n";
}
} // end function