From 5d9f92f7bcd1b14655e82a03facfc9562b6b59de Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Sat, 4 May 2013 08:35:16 +0530
Subject: [PATCH] PMA_DBI_next_result --> PMA_DBI_nextResult

---
 libraries/dbi/drizzle.dbi.lib.php  | 2 +-
 libraries/dbi/dummy.lib.php        | 2 +-
 libraries/dbi/mysql.dbi.lib.php    | 2 +-
 libraries/dbi/mysqli.dbi.lib.php   | 2 +-
 libraries/rte/rte_routines.lib.php | 2 +-
 sql.php                            | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php
index 47fcba5a91..143f22454b 100644
--- a/libraries/dbi/drizzle.dbi.lib.php
+++ b/libraries/dbi/drizzle.dbi.lib.php
@@ -277,7 +277,7 @@ function PMA_DBI_moreResults()
  *
  * @return bool false
  */
-function PMA_DBI_next_result()
+function PMA_DBI_nextResult()
 {
     // N.B.: PHP's 'mysql' extension does not support
     // multi_queries so this function will always
diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php
index d738a72e91..c1a99a8b7e 100644
--- a/libraries/dbi/dummy.lib.php
+++ b/libraries/dbi/dummy.lib.php
@@ -448,7 +448,7 @@ function PMA_DBI_moreResults()
  *
  * @return boo false
  */
-function PMA_DBI_next_result()
+function PMA_DBI_nextResult()
 {
     return false;
 }
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index ac03a65255..7135892adb 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -302,7 +302,7 @@ function PMA_DBI_moreResults()
  *
  * @return boo false
  */
-function PMA_DBI_next_result()
+function PMA_DBI_nextResult()
 {
     // N.B.: PHP's 'mysql' extension does not support
     // multi_queries so this function will always
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 110f59d33a..0009cff8cc 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -369,7 +369,7 @@ function PMA_DBI_moreResults($link = null)
  *
  * @return bool true or false
  */
-function PMA_DBI_next_result($link = null)
+function PMA_DBI_nextResult($link = null)
 {
     if (empty($link)) {
         if (isset($GLOBALS['userlink'])) {
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 972904b0a8..fa9f112be6 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -1417,7 +1417,7 @@ function PMA_RTN_handleExecute()
 
                     PMA_DBI_freeResult($result);
 
-                } while (PMA_DBI_next_result());
+                } while (PMA_DBI_nextResult());
 
                 $output .= "</fieldset>";
 
diff --git a/sql.php b/sql.php
index 75bdd8639c..d2c62a234e 100644
--- a/sql.php
+++ b/sql.php
@@ -643,7 +643,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
         if (! PMA_DBI_moreResults()) {
             break;
         }
-    } while (PMA_DBI_next_result());
+    } while (PMA_DBI_nextResult());
 
     $is_procedure = false;
     if (stripos($full_sql_query, 'call') !== false) {
@@ -1613,7 +1613,7 @@ function getTableHtmlForMultipleQueries(
 
         $sql_no++;
 
-    } while (PMA_DBI_moreResults() && PMA_DBI_next_result());
+    } while (PMA_DBI_moreResults() && PMA_DBI_nextResult());
 
     return $table_html;
 }