From b073c6365e73e5a4f4469dbd15d09081fe13395c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 23 Aug 2005 23:08:21 +0000 Subject: [PATCH] patch #1257134: no longer emit the strPmaUriError message --- ChangeLog | 4 ++++ Documentation.html | 16 ++++------------ config.inc.php | 13 +------------ libraries/common.lib.php | 17 ++++++----------- main.php | 7 ++----- 5 files changed, 17 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index a20674b9a..e95f6cd46 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ $Source$ 2005-08-23 Marc Delisle * libraries/display_tbl.lib.php: bug #1267177, wrong return page + * main.php, libraries/common.lib.php, Documentation.html, + config.inc.php: patch #1257134, removed code to display the warning if + PmaAbsoluteUri is not set. A notice will still display if the autodetect + code is unable to figure out the proper URI. Thanks to Isaac Bennetch 2005-08-23 Michal Čihař * libraries/database_interface.lib.php: Abide cfg['Lang'] settings even if diff --git a/Documentation.html b/Documentation.html index 370d4a0e8..e34f28a14 100755 --- a/Documentation.html +++ b/Documentation.html @@ -397,23 +397,15 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';

Starting with version 2.3.0, it is advisable to try leaving this blank. In most cases phpMyAdmin automatically detects the proper - setting. Additional details are in the configuration file. If you - leave it blank, see the notes for - $cfg['PmaAbsoluteUri_DisableWarning']; you probably want - to change that to TRUE. + setting. Additional details are in the configuration file.

Don't forget the slash at the end of your URL. The URL must contain characters that are valid for a URL, and on some servers, the path is case-sensitive.

- -
$cfg['PmaAbsoluteUri_DisableWarning'] boolean
-
- By default, when you leave $cfg['PmaAbsoluteUri'] empty, and the system - detects your absolute URI automatically, we display a warning to remind - you. If you have tested the automatic detection, and it works perfectly - for your setup, then you can set this variable to squelch the warning. -

+ If you get an error that this must be set or if the autodetect code + fails to detect your path, please post a bug report on our + bug tracker so we can improve the code.
$cfg['PmaNoRelation_DisableWarning'] boolean
diff --git a/config.inc.php b/config.inc.php index 11b97887d..37ad9bfeb 100644 --- a/config.inc.php +++ b/config.inc.php @@ -19,7 +19,7 @@ if (!isset($old_error_reporting)) { /** - * Your phpMyAdmin url + * Your phpMyAdmin URL. * * Complete the variable below with the full url ie * http://www.your_web.net/path_to_your_phpMyAdmin_directory/ @@ -32,20 +32,9 @@ if (!isset($old_error_reporting)) { * test to see that the auto-detection code works in your system. A good * test is to browse a table, then edit a row and save it. There will be * an error message if phpMyAdmin cannot auto-detect the correct value. - * - * If the auto-detection code does work properly, you can set to TRUE the - * $cfg['PmaAbsoluteUri_DisableWarning'] variable below. */ $cfg['PmaAbsoluteUri'] = ''; - -/** - * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set - * You should use this if and ONLY if the PmaAbsoluteUri auto-detection - * works perfectly. - */ -$cfg['PmaAbsoluteUri_DisableWarning'] = FALSE; - /** * Disable the default warning that is displayed on the DB Details Structure page if * any of the required Tables for the relationfeatures could not be found diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 672a96b72..556f043a6 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -998,10 +998,9 @@ if ($is_minimum_common == FALSE) { * set properly and, depending on browsers, inserting or updating a * record might fail */ - $display_pmaAbsoluteUri_warning = 0; // Setup a default value to let the people and lazy syadmins work anyway, - // but display a big warning on the main.php page. + // they'll get an error if the autodetect code doesn't work if (empty($cfg['PmaAbsoluteUri'])) { $url = array(); @@ -1080,15 +1079,11 @@ if ($is_minimum_common == FALSE) { unset($url); - // We display the warning by default, but not if it is disabled thru - // via the $cfg['PmaAbsoluteUri_DisableWarning'] variable. - // This is intended for sysadmins that actually want the default - // behaviour of auto-detection due to their setup. - // See the mailing list message: - // http://sourceforge.net/mailarchive/forum.php?thread_id=859093&forum_id=2141 - if ($cfg['PmaAbsoluteUri_DisableWarning'] == FALSE) { - $display_pmaAbsoluteUri_warning = 1; - } + // We used to display a warning if PmaAbsoluteUri wasn't set, but now + // the autodetect code works well enough that we don't display the + // warning at all. The user can still set PmaAbsoluteUri manually. + // See https://sourceforge.net/tracker/index.php?func=detail&aid=1257134&group_id=23067&atid=377411 + } else { // The URI is specified, however users do often specify this // wrongly, so we try to fix this. diff --git a/main.php b/main.php index 30093cd9c..185d34dbf 100644 --- a/main.php +++ b/main.php @@ -590,12 +590,9 @@ echo "\n"; ' . $strPmaUriError . '' . "\n"; -} /** * Warning if using the default MySQL privileged account