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

* fixed bug 481593 - interface fonts too big on macs;

Browse Source 
* taked into account the case when "magic_quotes_sybase" is set in the php configuration file and fixed the js errors.
This commit is contained in:
Loïc Chapeaux
2001-11-14 20:50:23 +00:00
parent bc54ef7d50
commit 472a433a07
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/common.lib.php3
View File

@@ -780,8 +780,10 @@ if (!defined('__LIB_COMMON__')){
: 'x-small'; : 'x-small';
$font_smallest = 'x-small'; $font_smallest = 'x-small';
} }
// Mac browsers: need bigger fonts // Mac browsers: need bigger fonts except IE 5+ & NS 6+
else if (USR_OS == 'Mac') { else if (USR_OS == 'Mac'
&& ((USR_BROWSER_AGENT != 'IE' && USR_BROWSER_AGENT != 'MOZILLA')
|| USR_BROWSER_VER < 5)) {
$font_size = 'medium'; $font_size = 'medium';
$font_bigger = 'x-large '; $font_bigger = 'x-large ';
$font_smaller = 'small'; $font_smaller = 'small';
@@ -839,13 +841,17 @@ if (!defined('__LIB_COMMON__')){
*/ */
function js_format($a_string = '', $add_backquotes = TRUE) function js_format($a_string = '', $add_backquotes = TRUE)
{ {
$a_string = str_replace('"', '&quot;', $a_string); if (is_string($a_string)) {
$a_string = str_replace('#', '\\#', addslashes($a_string)); $a_string = str_replace('"', '&quot;', $a_string);
$a_string = str_replace("\012", '\\\\n', $a_string); $a_string = str_replace('\\', '\\\\', $a_string);
$a_string = str_replace("\015", '\\\\r', $a_string); $a_string = str_replace('\'', '\\\'', $a_string);
$a_string = str_replace('#', '\\#', $a_string);
$a_string = str_replace("\012", '\\\\n', $a_string);
$a_string = str_replace("\015", '\\\\r', $a_string);
}
return (($add_backquotes) ? backquote($a_string) : $a_string); return (($add_backquotes) ? backquote($a_string) : $a_string);
} // end of the 'sql_addslashes()' function } // end of the 'js_format()' function
/** /**