diff --git a/import.php b/import.php index 958b60673b..f6025e82ea 100644 --- a/import.php +++ b/import.php @@ -424,7 +424,7 @@ if (isset($GLOBALS['show_as_php'])) { } // We can not read all at once, otherwise we can run out of memory -$memory_limit = trim(@ini_get('memory_limit')); +$memory_limit = trim(ini_get('memory_limit')); // 2 MB as default if (empty($memory_limit)) { $memory_limit = 2 * 1024 * 1024; diff --git a/index.php b/index.php index 48537c086d..79b59ba508 100644 --- a/index.php +++ b/index.php @@ -525,7 +525,7 @@ if ($cfg['LoginCookieValidityDisableWarning'] == false) { /** * Check whether session.gc_maxlifetime limits session validity. */ - $gc_time = (int)@ini_get('session.gc_maxlifetime'); + $gc_time = (int)ini_get('session.gc_maxlifetime'); if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) { trigger_error( __( @@ -626,8 +626,8 @@ if ($server > 0) { * Warning about Suhosin only if its simulation mode is not enabled */ if ($cfg['SuhosinDisableWarning'] == false - && @ini_get('suhosin.request.max_value_length') - && @ini_get('suhosin.simulation') == '0' + && ini_get('suhosin.request.max_value_length') + && ini_get('suhosin.simulation') == '0' ) { trigger_error( sprintf( diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 41d0460bc9..20bef14c70 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -141,7 +141,7 @@ class Config { // If zlib output compression is set in the php configuration file, no // output buffering should be run - if (@ini_get('zlib.output_compression')) { + if (ini_get('zlib.output_compression')) { $this->set('OBGzip', false); } diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index c53761d9d0..4a0687ddea 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -1206,7 +1206,7 @@ class Core * We specifically use empty here as we are looking for anything else than * empty value or 0. */ - if (extension_loaded('mbstring') && !empty(@ini_get('mbstring.func_overload'))) { + if (extension_loaded('mbstring') && !empty(ini_get('mbstring.func_overload'))) { self::fatalError( __( 'You have enabled mbstring.func_overload in your PHP ' diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index 3a47a37578..1f48b5f0c9 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -68,7 +68,7 @@ class Export && PMA_USR_BROWSER_VER >= 43; // see bug #4942 if (function_exists('gzencode') - && ((! @ini_get('zlib.output_compression') + && ((! ini_get('zlib.output_compression') && ! self::isGzHandlerEnabled()) || $GLOBALS['save_on_server'] || $chromeAndGreaterThan43) @@ -224,7 +224,7 @@ class Export */ public static function getMemoryLimit() { - $memory_limit = trim(@ini_get('memory_limit')); + $memory_limit = trim(ini_get('memory_limit')); $memory_limit_num = (int)substr($memory_limit, 0, -1); $lowerLastChar = strtolower(substr($memory_limit, -1)); // 2 MB as default diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 4c6bca9048..d5bfb98b68 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -252,7 +252,7 @@ class Header 'pftext' => $pftext, 'confirm' => $GLOBALS['cfg']['Confirm'], 'LoginCookieValidity' => $GLOBALS['cfg']['LoginCookieValidity'], - 'session_gc_maxlifetime' => (int)@ini_get('session.gc_maxlifetime'), + 'session_gc_maxlifetime' => (int)ini_get('session.gc_maxlifetime'), 'logged_in' => (isset($GLOBALS['dbi']) ? $GLOBALS['dbi']->isUserType('logged') : false), 'is_https' => $GLOBALS['PMA_Config']->isHttps(), 'rootPath' => $GLOBALS['PMA_Config']->getRootPath(),