Fix highlighting in database debug toolbar

codeigniter4 · Sep 25, 2021 · 1e333e6 · 1e333e6
1 parent c05f5a6
commit 1e333e6
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/system/Database/Query.php b/system/Database/Query.php
@@ -372,23 +372,23 @@ public function debugToolbarDisplay(): string
             'FROM',
             'WHERE',
             'AND',
-            'LEFT&nbsp;JOIN',
-            'RIGHT&nbsp;JOIN',
+            'LEFT JOIN',
+            'RIGHT JOIN',
             'JOIN',
-            'ORDER&nbsp;BY',
-            'GROUP&nbsp;BY',
+            'ORDER BY',
+            'GROUP BY',
             'LIMIT',
             'INSERT',
             'INTO',
             'VALUES',
             'UPDATE',
-            'OR&nbsp;',
+            'OR ',
             'HAVING',
             'OFFSET',
-            'NOT&nbsp;IN',
+            'NOT IN',
             'IN',
             'LIKE',
-            'NOT&nbsp;LIKE',
+            'NOT LIKE',
             'COUNT',
             'MAX',
             'MIN',
@@ -407,7 +407,9 @@ public function debugToolbarDisplay(): string
         $sql = $this->finalQueryString;
 
         foreach ($highlight as $term) {
-            $sql = str_replace($term, '<strong>' . $term . '</strong>', $sql);
+            $from = $term;
+            $to   = '<strong>' . str_replace(' ', '&nbsp;', $term) . '</strong>';
+            $sql  = str_replace($from, $to, $sql);
         }
 
         return $sql;