From 0064af77ea754f6534d0588c63ab7d2f291c3c7f Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 22 Jun 2017 01:00:27 +1000
Subject: [PATCH] Simplify PHP code generation

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/Util.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/libraries/Util.php b/libraries/Util.php
index 730f788c7d..cbde41e982 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -1025,7 +1025,8 @@ class Util
                     $query_base
                 );
                 $query_base = '<code class="php"><pre>' . "\n"
-                    . '$sql = "' . $query_base;
+                    . '$sql = "' . $query_base . '";' . "\n"
+                    . '</pre></code>';
             } elseif ($query_too_big) {
                 $query_base = htmlspecialchars($query_base);
             } else {
@@ -1166,12 +1167,6 @@ class Util
 
             $retval .= '<div class="sqlOuter">';
             $retval .= $query_base;
-
-            //Clean up the end of the PHP
-            if (! empty($GLOBALS['show_as_php'])) {
-                $retval .= '";' . "\n"
-                    . '</pre></code>';
-            }
             $retval .= '</div>';
 
             $retval .= '<div class="tools print_ignore">';