Merge remote branch 'upstream/master'

libraries/db_common.inc.php

@@ -11,7 +11,6 @@ if (! defined('PHPMYADMIN')) {
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
 require_once './libraries/bookmark.lib.php';
 
 PMA_checkParameters(array('db'));

libraries/db_info.inc.php

@@ -15,11 +15,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-/**
- * requirements
- */
-require_once './libraries/common.inc.php';
-
 /**
  * limits for table list
  */

libraries/header_printview.inc.php

@@ -9,9 +9,8 @@ if (! defined('PHPMYADMIN')) {
 }
 
 /**
- * Gets a core script and starts output buffering work
+ * Starts output buffering work
  */
-require_once './libraries/common.inc.php';
 require_once './libraries/ob.lib.php';
 PMA_outBufferPre();
 

libraries/header_scripts.inc.php

@@ -8,12 +8,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-/**
- *
- */
-require_once './libraries/common.inc.php';
-
-
 // Cross-framing protection
 if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
     echo PMA_includeJS('cross_framing_protection.js');

libraries/server_common.inc.php

@@ -7,11 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-/**
- * Gets some core libraries
- */
-require_once './libraries/common.inc.php';
-
 /**
  * Handles some variables that may have been sent by the calling script
  * Note: this can be called also from the db panel to get the privileges of

libraries/tbl_common.inc.php

@@ -11,7 +11,6 @@ if (! defined('PHPMYADMIN')) {
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
 require_once './libraries/bookmark.lib.php';
 
 // Check parameters

libraries/tbl_info.inc.php

@@ -12,11 +12,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-/**
- * requirements
- */
-require_once './libraries/common.inc.php';
-
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
 

libraries/tbl_properties.inc.php

@@ -13,7 +13,6 @@ if (! defined('PHPMYADMIN')) {
 /**
  * Check parameters
  */
-require_once './libraries/common.inc.php';
 require_once './libraries/common.lib.php';
 PMA_checkParameters(array('db', 'table', 'action', 'num_fields'));
 

libraries/tbl_replace_fields.inc.php

@@ -24,7 +24,6 @@ if (! defined('PHPMYADMIN')) {
 /**
  * Gets some core libraries
  */
-require_once './libraries/common.inc.php';
 require_once './libraries/File.class.php';
 
 $file_to_insert = new PMA_File();

phpmyadmin.css.php

@@ -23,14 +23,6 @@ if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER == '6'
     @ini_set('zlib.output_compression', 'Off');
 }
 
-if ($GLOBALS['text_dir'] === 'ltr') {
-    $right = 'right';
-    $left = 'left';
-} else {
-    $right = 'left';
-    $left = 'right';
-}
-
 // Send correct type:
 header('Content-Type: text/css; charset=UTF-8');
 

tbl_printview.php

@@ -10,8 +10,6 @@
  */
 require_once 'libraries/common.inc.php';
 
-require 'libraries/tbl_common.inc.php';
-
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
@@ -21,6 +19,8 @@ if (! isset($selected_tbl)) {
     include_once 'libraries/header.inc.php';
 }
 
+require 'libraries/tbl_common.inc.php';
+
 // Check parameters
 
 if (! isset($the_tables) || ! is_array($the_tables)) {