From 55114b95e021bbb5cc633ca98ea0aa8fc5c7b046 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 17 Oct 2014 13:07:25 +0530 Subject: [PATCH] Wrap more long lines Signed-off-by: Madhura Jayaratne --- libraries/DisplayResults.class.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 9e41379d82..f0befca0b0 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2144,7 +2144,10 @@ class PMA_DisplayResults private function _getSortingUrlParams( $sort_direction, $sort_order, $column_index, $index ) { - if ($GLOBALS['PMA_String']->strtoupper(trim($sort_direction[$index])) == self::DESCENDING_SORT_DIR) { + $sort_direction_upper = $GLOBALS['PMA_String']->strtoupper( + trim($sort_direction[$index]) + ); + if ($sort_direction_upper == self::DESCENDING_SORT_DIR) { $sort_order .= ' ASC'; $order_img = ' ' . PMA_Util::getImage( 's_desc.png', __('Descending'), @@ -2963,18 +2966,17 @@ class PMA_DisplayResults // Check whether the field needs to display with syntax highlighting - if (! empty($this->transformation_info[$pmaString->strtolower($this->__get('db'))][$pmaString->strtolower($this->__get('table'))][$pmaString->strtolower($meta->name)]) + $dbLower = $pmaString->strtolower($this->__get('db')); + $tblLower = $pmaString->strtolower($this->__get('table')); + $nameLower = $pmaString->strtolower($meta->name); + if (! empty($this->transformation_info[$dbLower][$tblLower][$nameLower]) && (trim($row[$i]) != '') ) { $row[$i] = PMA_Util::formatSql($row[$i]); include_once $this->transformation_info - [$pmaString->strtolower($this->__get('db'))] - [$pmaString->strtolower($this->__get('table'))] - [$pmaString->strtolower($meta->name)][0]; + [$dbLower][$tblLower][$nameLower][0]; $transformation_plugin = new $this->transformation_info - [$pmaString->strtolower($this->__get('db'))] - [$pmaString->strtolower($this->__get('table'))] - [$pmaString->strtolower($meta->name)][1](null); + [$dbLower][$tblLower][$nameLower][1](null); $transform_options = PMA_Transformation_getOptions( isset($mime_map[$meta->name]['transformation_options']) @@ -2982,7 +2984,6 @@ class PMA_DisplayResults : '' ); - $dbLower = $pmaString->strtolower($this->__get('db')); $meta->mimetype = str_replace( '_', '/', $this->transformation_info[$dbLower] @@ -2996,7 +2997,7 @@ class PMA_DisplayResults include_once 'libraries/special_schema_links.lib.php'; if (isset($GLOBALS['special_schema_links']) - && (! empty($GLOBALS['special_schema_links'][$pmaString->strtolower($this->__get('db'))][$pmaString->strtolower($this->__get('table'))][$pmaString->strtolower($meta->name)])) + && (! empty($GLOBALS['special_schema_links'][$dbLower][$tblLower][$nameLower])) ) { $linking_url = $this->_getSpecialLinkUrl(