Merge branch 'QA_4_6'

phpmyadmin · Jun 24, 2016 · 1c08750 · 1c08750
2 parents ce67a31 + f204208
commit 1c08750
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php
@@ -660,7 +660,7 @@ private function _getRegexReplaceRows(
             /* Iterate over possible delimiters to get one */
             $delimiters = array('/', '@', '#', '~', '!', '$', '%', '^', '&', '_');
             $found = false;
-            for ($i = 0; $i < count($delimiters); $i++) {
+            for ($i = 0, $l = count($delimiters); $i < $l; $i++) {
                 if (strpos($find, $delimiters[$i]) === false) {
                     $found = true;
                     break;

diff --git a/templates/database/designer/database_tables.phtml b/templates/database/designer/database_tables.phtml
@@ -1,4 +1,4 @@
-<?php for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) :
+<?php for ($i = 0, $l = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $l; $i++) :
     $t_n = $GLOBALS['PMD']["TABLE_NAME"][$i];
     $t_n_url = $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>
     <input name="t_x[<?= $t_n_url; ?>]" type="hidden" id="t_x_<?= $t_n_url; ?>_" />
@@ -137,4 +137,4 @@
             <?php endfor; ?>
         </tbody>
     </table>
-<?php endfor; ?>
+<?php endfor; ?>