Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-05-27 18:37:54 +02:00
commit 53ff85c3af

View File

@ -43,7 +43,8 @@ abstract class SQLTransformationsPlugin extends TransformationsPlugin
*/
public function applyTransformation($buffer, $options = array(), $meta = '')
{
$result = PMA_SQP_format(PMA_SQP_parse($buffer));
// see PMA_highlightSQL()
$result = '<code class="sql"><pre>' . $buffer . '</pre></code>';
// Need to clear error state not to break subsequent queries display.
PMA_SQP_resetError();
return $result;