From 1807efb18fce0e06419642bfba4cf184d9fa51e5 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Tue, 8 May 2012 19:53:52 +0100 Subject: [PATCH 1/3] Removed pointless includes: If common.inc.php was not already included we would fail the !defined('PHPMYADMIN') check at the top of each file. --- libraries/db_common.inc.php | 1 - libraries/db_info.inc.php | 5 ----- libraries/header_printview.inc.php | 3 +-- libraries/header_scripts.inc.php | 6 ------ libraries/server_common.inc.php | 5 ----- libraries/tbl_common.inc.php | 1 - libraries/tbl_info.inc.php | 5 ----- libraries/tbl_properties.inc.php | 1 - libraries/tbl_replace_fields.inc.php | 1 - 9 files changed, 1 insertion(+), 27 deletions(-) diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index cdaed98e01..63fc4de1d4 100644 --- a/libraries/db_common.inc.php +++ b/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')); diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index ab9a278cb7..64cd9ca2a9 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -15,11 +15,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * requirements - */ -require_once './libraries/common.inc.php'; - /** * limits for table list */ diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 05e9b49b1b..51f971467d 100644 --- a/libraries/header_printview.inc.php +++ b/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(); diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index 6af268e4f4..61fc2643d9 100644 --- a/libraries/header_scripts.inc.php +++ b/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'); diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index b84e4af908..84298bf854 100644 --- a/libraries/server_common.inc.php +++ b/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 diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php index 02136a9e7b..8a7db62744 100644 --- a/libraries/tbl_common.inc.php +++ b/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 diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index 00f807ec5e..cea1bc0f6f 100644 --- a/libraries/tbl_info.inc.php +++ b/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')); diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 219896a150..1c90c2ba50 100644 --- a/libraries/tbl_properties.inc.php +++ b/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')); diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 96ec4ab58e..ba06124030 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/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(); From 83b9f16545d4bd54e91db5387ba7a27010b3e8ad Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 28 Apr 2012 11:35:42 +0100 Subject: [PATCH 2/3] Language direction vars are already set in Theme.class.php --- phpmyadmin.css.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index 52268a4e8d..550d963611 100644 --- a/phpmyadmin.css.php +++ b/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'); From fe48cd531d941cb25207b3db534bc59da30d1d65 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Tue, 8 May 2012 21:05:04 +0100 Subject: [PATCH 3/3] Fixed rendering of tbl_printview.php --- tbl_printview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_printview.php b/tbl_printview.php index 2cba9aa62d..ea16713fa6 100644 --- a/tbl_printview.php +++ b/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)) {