Resolve merge conflicts for upstream merge

1 files changed, 2 insertions, 3 deletions

diff --git a/tbl_row_action.php b/tbl_row_action.php
index 356ad57d94..8a9db7a587 100755
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -28,7 +28,7 @@ if (! PMA_isValid($_REQUEST['rows_to_delete'], 'array')
     $disp_message = __('No rows selected');
     $disp_query = '';
     require './sql.php';
-    require_once './libraries/footer.inc.php';
+    require './libraries/footer.inc.php';
 }
 
 if (isset($_REQUEST['submit_mult'])) {
@@ -71,7 +71,6 @@ switch($submit_mult) {
 }
 
 $GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'functions.js';
 
 require_once './libraries/header.inc.php';
 
@@ -149,7 +148,7 @@ if (!empty($submit_mult)) {
             /**
              * Displays the footer
              */
-            require_once './libraries/footer.inc.php';
+            require './libraries/footer.inc.php';
             break;
     }
 }