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

bypass format_sql for now

Browse Source
This commit is contained in:
Marc Delisle
2002-06-19 20:39:01 +00:00
parent 8cca204a5c
commit f490727af1
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -22,6 +22,8 @@ $Source$
* lang/swedish updates, thanks to Bj<42>rn T. Hallberg * lang/swedish updates, thanks to Bj<42>rn T. Hallberg
* lang/galician updates, thanks to Xos<6F> Calvo * lang/galician updates, thanks to Xos<6F> Calvo
* libraries/config_import.lib.php3, fixed 3 parse errors * libraries/config_import.lib.php3, fixed 3 parse errors
* common.lib.php3: due to formatting problems, bypass PMA_format_sql
for 2.3.0-rc1
2002-06-19 Robin Johnson <robbat2@users.sourceforge.net> 2002-06-19 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/charset_conversion.lib.php3, * libraries/charset_conversion.lib.php3,

3
Documentation.html
View File

@@ -1216,7 +1216,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
Introduced in 2.3.0 PhpMyAdmin is now able to show SQL in Syntaxcoloring. Introduced in 2.3.0 PhpMyAdmin is now able to show SQL in Syntaxcoloring.
To use this feature set this value to TRUE (the default). If not everything To use this feature set this value to TRUE (the default). If not everything
you want is colored or to influence where a newline is inserted see the you want is colored or to influence where a newline is inserted see the
Configurationarrays $cfg['keywords'] and $cfg['additional'] Configurationarrays $cfg['keywords'] and $cfg['additional']. Note:
for version 2.3.0-rc1, syntax coloring is non functional.
</dd> </dd>
<dt><b>$cfg['colorFunctions'] </b>string [HTML color]</dt> <dt><b>$cfg['colorFunctions'] </b>string [HTML color]</dt>
<dd> <dd>

3
libraries/common.lib.php3
View File

@@ -213,6 +213,9 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
function PMA_format_sql ($sql) { function PMA_format_sql ($sql) {
global $cfg, $mult; global $cfg, $mult;
// lem9: bypass this function for now
return $sql;
$_sfuncs = '^' . implode('$|^', $cfg['Functions']) . '$'; $_sfuncs = '^' . implode('$|^', $cfg['Functions']) . '$';
$_skeyw = '^' . implode('$|^', $cfg['keywords']) . '$'; $_skeyw = '^' . implode('$|^', $cfg['keywords']) . '$';
$_scoltype = '^' . implode('$|^', $cfg['ColumnTypes']) . '$'; $_scoltype = '^' . implode('$|^', $cfg['ColumnTypes']) . '$';