gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Atul Pratap Singh 2013-10-15 00:03:09 +05:30
commit 00599cb37e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/DisplayResults.class.php
View File

@ -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