From 8691ff3c30a9e6af2ec271b6b93fa557397f92bf Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 14 Oct 2013 04:55:28 -0400 Subject: [PATCH] Fix coding style --- libraries/DisplayResults.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 0c8ef12baa..c57ab49a09 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3142,8 +3142,9 @@ class PMA_DisplayResults // Special case 1 - when executing routines, according // to the type of the routine, url param changes if (!empty($row_info['routine_type'])) { - if (strtolower($row_info['routine_type']) == self::ROUTINE_PROCEDURE - || strtolower($row_info['routine_type']) == self::ROUTINE_FUNCTION + $lowerRoutineType = strtolower($row_info['routine_type']); + if ($lowerRoutineType == self::ROUTINE_PROCEDURE + || $lowerRoutineType == self::ROUTINE_FUNCTION ) { $linking_url_params['edit_item'] = 1; } @@ -3522,7 +3523,8 @@ class PMA_DisplayResults $class = 'data ' . $grid_edit_class . ' ' . $not_null_class . ' ' . $relation_class . ' ' . $hide_class . ' ' . $field_type_class; - if (($_SESSION['tmp_user_values']['disp_direction'] == self::DISP_DIR_VERTICAL) + $disp_direction = $_SESSION['tmp_user_values']['disp_direction']; + if (($disp_direction == self::DISP_DIR_VERTICAL) && (! isset($printview) || ($printview != '1')) ) { // the row number corresponds to a data row, not HTML table row