diff --git a/browse_foreigners.php b/browse_foreigners.php index dea79c4e56..a073cb2bcb 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -34,10 +34,10 @@ $template = $containerBuilder->get('template'); $containerBuilder->set( 'browse_foreigners', new BrowseForeigners( - $GLOBALS['cfg']['LimitChars'], - $GLOBALS['cfg']['MaxRows'], - $GLOBALS['cfg']['RepeatCells'], - $GLOBALS['cfg']['ShowAll'], + (int) $GLOBALS['cfg']['LimitChars'], + (int) $GLOBALS['cfg']['MaxRows'], + (int) $GLOBALS['cfg']['RepeatCells'], + (bool) $GLOBALS['cfg']['ShowAll'], $GLOBALS['pmaThemeImage'], $template ) diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index af1b1fb998..463d389b17 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -4449,7 +4449,7 @@ class Results mb_substr( (string) $column_for_first_row, 0, - $GLOBALS['cfg']['LimitChars'] + (int) $GLOBALS['cfg']['LimitChars'] ) . '...' ); @@ -4478,7 +4478,7 @@ class Results mb_substr( (string) $column_for_last_row, 0, - $GLOBALS['cfg']['LimitChars'] + (int) $GLOBALS['cfg']['LimitChars'] ) . '...' ); @@ -5682,7 +5682,7 @@ class Results $str = mb_substr( $str, 0, - $GLOBALS['cfg']['LimitChars'] + (int) $GLOBALS['cfg']['LimitChars'] ) . '...'; $truncated = true; } else { diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index 6b51d0e476..2e05aff0cd 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -1354,7 +1354,7 @@ class Relation mb_substr( $value, 0, - $GLOBALS['cfg']['LimitChars'] + (int) $GLOBALS['cfg']['LimitChars'] ) . '...' ); } diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 18ed15fdce..5c8228f75a 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2972,7 +2972,7 @@ class Util mb_substr( $printtype, 0, - $GLOBALS['cfg']['LimitChars'] + (int) $GLOBALS['cfg']['LimitChars'] ) . '...' ); $displayed_type .= ''; @@ -4448,7 +4448,7 @@ class Util ) { $rows = $_SESSION['tmpval']['max_rows']; } else { - $rows = $GLOBALS['cfg']['MaxRows']; + $rows = (int) $GLOBALS['cfg']['MaxRows']; $_SESSION['tmpval']['max_rows'] = $rows; }