Merge remote-tracking branch 'origin/master'

phpmyadmin · Jun 1, 2017 · 8fa57d2 · 8fa57d2
2 parents bff42f0 + cf471a0
commit 8fa57d2
Show file tree

Hide file tree

Showing 40 changed files with 577 additions and 586 deletions.
diff --git a/browse_foreigners.php b/browse_foreigners.php
@@ -8,7 +8,6 @@
 use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
-require_once 'libraries/transformations.lib.php';
 require_once 'libraries/browse_foreigners.lib.php';
 
 /**

diff --git a/db_datadict.php b/db_datadict.php
@@ -5,8 +5,10 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+
 use PMA\libraries\Response;
+use PMA\libraries\Transformations;
+use PMA\libraries\URL;
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
@@ -37,8 +39,6 @@
  */
 $cfgRelation  = PMA_getRelationsParam();
 
-require_once 'libraries/transformations.lib.php';
-
 /**
  * Check parameters
  */
@@ -186,7 +186,7 @@
         }
         echo '</td>' , "\n";
         if ($cfgRelation['mimework']) {
-            $mime_map = PMA_getMIME($db, $table, true);
+            $mime_map = Transformations::getMIME($db, $table, true);
 
             echo '    <td>';
             if (isset($mime_map[$column_name])) {

diff --git a/export.php b/export.php
@@ -407,9 +407,6 @@
     if ($do_relation || $do_comments || $do_mime) {
         $cfgRelation = PMA_getRelationsParam();
     }
-    if ($do_mime) {
-        include_once 'libraries/transformations.lib.php';
-    }
 
     // Include dates in export?
     $do_dates = isset($GLOBALS[$what . '_dates']);

diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
@@ -9,10 +9,9 @@
 
 use PhpMyAdmin\SqlParser\Utils\Query;
 use PMA\libraries\plugins\transformations\Text_Plain_Link;
-use PMA\libraries\URL;
 use PMA\libraries\Sanitize;
-
-require_once './libraries/transformations.lib.php';
+use PMA\libraries\Transformations;
+use PMA\libraries\URL;
 
 /**
  * Handle all the functionalities related to displaying results
@@ -2915,7 +2914,7 @@ private function _setMimeMap()
             ) {
                 $mimeMap = array_merge(
                     $mimeMap,
-                    PMA_getMIME($this->__get('db'), $meta->orgtable, false, true)
+                    Transformations::getMIME($this->__get('db'), $meta->orgtable, false, true)
                 );
                 $added[$orgFullTableName] = true;
             }
@@ -3060,14 +3059,14 @@ private function _getRowValues(
                     if (file_exists($include_file)) {
 
                         include_once $include_file;
-                        $class_name = PMA_getTransformationClassName($include_file);
+                        $class_name = Transformations::getClassName($include_file);
                         // todo add $plugin_manager
                         $plugin_manager = null;
                         $transformation_plugin = new $class_name(
                             $plugin_manager
                         );
 
-                        $transform_options  = PMA_Transformation_getOptions(
+                        $transform_options  = Transformations::getOptions(
                             isset(
                                 $mime_map[$orgFullColName]
                                 ['transformation_options']
@@ -3100,7 +3099,7 @@ private function _getRowValues(
                 $transformation_plugin = new $this->transformation_info
                     [$dbLower][$tblLower][$nameLower][1](null);
 
-                $transform_options  = PMA_Transformation_getOptions(
+                $transform_options  = Transformations::getOptions(
                     isset($mime_map[$orgFullColName]['transformation_options'])
                     ? $mime_map[$orgFullColName]['transformation_options']
                     : ''