Merge pull request #14854 from Tithugues/fix/fix-wrong-case-in-functi…

…on-names Fix wrong case in function names
phpmyadmin · Jan 12, 2019 · 5acaa56 · 5acaa56
2 parents 9ed3d6e + 6358cd4
commit 5acaa56
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/ajax.php b/ajax.php
@@ -20,7 +20,7 @@
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 $response = Response::getInstance();
-$response->setAJAX(true);
+$response->setAjax(true);
 
 if (empty($_POST['type'])) {
     Core::fatalError(__('Bad type!'));

diff --git a/browse_foreigners.php b/browse_foreigners.php
@@ -78,4 +78,4 @@
     isset($data) ? $data : ''
 );
 
-$response->addHtml($html);
+$response->addHTML($html);
diff --git a/libraries/classes/Controllers/Server/ServerVariablesController.php b/libraries/classes/Controllers/Server/ServerVariablesController.php
@@ -96,12 +96,12 @@ public function indexAction()
             /**
              * Link templates
             */
-            $this->response->addHtml($this->_getHtmlForLinkTemplates());
+            $this->response->addHTML($this->_getHtmlForLinkTemplates());
 
             /**
              * Displays the page
             */
-            $this->response->addHtml(
+            $this->response->addHTML(
                 $this->_getHtmlForServerVariables($serverVars, $serverVarsSession)
             );
         } else {

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -4041,7 +4041,7 @@ private function _getDataCellForNonNumericColumns(
         $field_flags = $GLOBALS['dbi']->fieldFlags($dt_result, $col_index);
 
         $bIsText = gettype($transformation_plugin) === 'object'
-            && strpos($transformation_plugin->getMIMEtype(), 'Text')
+            && strpos($transformation_plugin->getMIMEType(), 'Text')
             === false;
 
         // disable inline grid editing

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -188,7 +188,7 @@ private function showEmptyResultMessageOrSetUniqueCondition(
         // No row returned
         if (! $rows[$key_id]) {
             unset($rows[$key_id], $where_clause_array[$key_id]);
-            Response::getInstance()->addHtml(
+            Response::getInstance()->addHTML(
                 Util::getMessage(
                     __('MySQL returned an empty result set (i.e. zero rows).'),
                     $local_query

diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php
@@ -143,7 +143,7 @@ public function doImport(array &$sql_data = [])
         /**
          * Analyze the data in each table
          */
-        $namespaces = $xml->getNameSpaces(true);
+        $namespaces = $xml->getNamespaces(true);
 
         /**
          * Get the database name, collation and charset