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

Merge conflict resolved for Lori's tree merge to main

Browse Source
This commit is contained in:
ninadsp
2010-08-22 12:42:54 +05:30
parent e1f319eef1 7be8236208
commit c9253c0a0e
144 changed files with 81403 additions and 55891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/sqlparser.lib.php
View File

@@ -2574,7 +2574,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
}
$after .= "\n";
*/
$str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : $arr[$i]['data']). $after;
$str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : htmlspecialchars($arr[$i]['data'])). $after;
} // end for
/* End possibly unclosed documentation link */
if ($close_docu_link) {
@@ -2662,21 +2662,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
return $formatted_sql;
} // end of the "PMA_SQP_formatNone()" function
/**
* Gets SQL queries in text format
*
* @todo WRITE THIS!
* @param array The SQL queries list
*
* @return string The SQL queries in text format
*
* @access public
*/
function PMA_SQP_formatText($arr)
{
return PMA_SQP_formatNone($arr);
} // end of the "PMA_SQP_formatText()" function
} // end if: minimal common.lib needed?
?>