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

bug #2032707 [core] PMA does not start if ini_set() is disabled

Browse Source
This commit is contained in:
Marc Delisle
2008-08-01 19:15:01 +00:00
parent f5159676c2
commit 55f1bc4d38
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
2.11.9.0 (not yet released)
- bug #2031221 [auth] Links to version number on login screen
- bug #2032707 [core] PMA does not start if ini_set() is disabled
2.11.8.0 (2008-07-28)
- patch #1987593 [interface] Table list pagination in navi,

2
export.php
View File

@@ -344,7 +344,7 @@ if (!$save_on_server) {
// Download
// (avoid rewriting data containing HTML with anchors and forms;
// this was reported to happen under Plesk)
ini_set('url_rewriter.tags','');
@ini_set('url_rewriter.tags','');
if (!empty($content_encoding)) {
header('Content-Encoding: ' . $content_encoding);

22
libraries/session.inc.php
View File

@@ -35,26 +35,26 @@ if (!@function_exists('session_name')) {
session_set_cookie_params(0, PMA_Config::getCookiePath() . '; HttpOnly',
'', PMA_Config::isHttps());
// cookies are safer
ini_set('session.use_cookies', true);
// cookies are safer (use @ini_set() in case this function is disabled)
@ini_set('session.use_cookies', true);
// but not all user allow cookies
ini_set('session.use_only_cookies', false);
ini_set('session.use_trans_sid', true);
ini_set('url_rewriter.tags',
@ini_set('session.use_only_cookies', false);
@ini_set('session.use_trans_sid', true);
@ini_set('url_rewriter.tags',
'a=href,frame=src,input=src,form=fakeentry,fieldset=');
//ini_set('arg_separator.output', '&');
// delete session/cookies when browser is closed
ini_set('session.cookie_lifetime', 0);
@ini_set('session.cookie_lifetime', 0);
// warn but dont work with bug
ini_set('session.bug_compat_42', false);
ini_set('session.bug_compat_warn', true);
@ini_set('session.bug_compat_42', false);
@ini_set('session.bug_compat_warn', true);
// use more secure session ids (with PHP 5)
if (version_compare(PHP_VERSION, '5.0.0', 'ge')) {
ini_set('session.hash_function', 1);
@ini_set('session.hash_function', 1);
}
// some pages (e.g. stylesheet) may be cached on clients, but not in shared
@@ -83,9 +83,9 @@ if (! isset($_COOKIE[$session_name])) {
ob_start();
$old_display_errors = ini_get('display_errors');
$old_error_reporting = error_reporting(E_ALL);
ini_set('display_errors', 1);
@ini_set('display_errors', 1);
$r = session_start();
ini_set('display_errors', $old_display_errors);
@ini_set('display_errors', $old_display_errors);
error_reporting($old_error_reporting);
unset($old_display_errors, $old_error_reporting);
$session_error = ob_get_contents();

2
phpmyadmin.css.php
View File

@@ -19,7 +19,7 @@ require_once './libraries/sqlparser.lib.php';
// when zlib_compression is on
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER == '6'
&& (ini_get('zlib.output_compression'))) {
ini_set('zlib.output_compression', 'Off');
@ini_set('zlib.output_compression', 'Off');
}
if ($GLOBALS['text_dir'] === 'ltr') {