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

Merge branch 'MAINT_3_3_5' into QA_3_3

Browse Source 
Conflicts:
	ChangeLog
	libraries/common.lib.php
This commit is contained in:
Michal Čihař
2010-08-20 13:36:49 +02:00
parent 893abac3e5 d128f80605
commit 41145feb12
16 changed files with 84 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/common.lib.php
View File

@@ -575,7 +575,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$formatted_sql = '';
} else {
if (strlen($the_query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$formatted_sql = substr($the_query, 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
$formatted_sql = htmlspecialchars(substr($the_query, 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]';
} else {
$formatted_sql = PMA_formatSql(PMA_SQP_parse($the_query), $the_query);
}