diff options
| -rw-r--r-- | data/config.default.php | 5 | ||||
| -rw-r--r-- | data/templates/top.inc.php | 2 | ||||
| -rw-r--r-- | tests/AllTests.php | 4 | ||||
| -rw-r--r-- | www/api/export_gcs.php | 2 | ||||
| -rw-r--r-- | www/gsearch/context.php | 2 | ||||
| -rw-r--r-- | www/gsearch/index.php | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/data/config.default.php b/data/config.default.php index ec2be20..3c54ce1 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -2,9 +2,10 @@ /** * Default configuration file for SemanticScuttle * - * This file is included just before config.inc.php + * This file is included just before config.php. * If there is something you want to change, copy the lines - * in your personal config.inc.php file + * in your personal config.php file. + * Do not modify _this_ file! * * This program is free software. You can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index 13b0347..9d81328 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -47,7 +47,7 @@ if (isset($subtitle)) { echo '<h2>'. $subtitle ."</h2>\n"; } if(DEBUG_MODE) { - echo '<p class="error">'. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.inc.php.') ."</p>\n"; + echo '<p class="error">'. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.php.') ."</p>\n"; } if (isset($error) && $error!='') { echo '<p class="error">'. $error ."</p>\n"; diff --git a/tests/AllTests.php b/tests/AllTests.php index f7a04cc..c6b9057 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -1,12 +1,10 @@ <?php /* * To launch all tests, type the following line into the root directory -* of SemanticScuttle (where is the config.inc.php file) : +* of SemanticScuttle (where is the config.php file) : * * phpunit --testdox-html tests/dox.html AllTests tests/allTests.php * -* !!Check that $debugMode = false in config.inc.php to avoid unstable beahviours!! -* * A dox.html file will be created into the tests/ directory providing a summary * of tests according to agile development. * */ diff --git a/www/api/export_gcs.php b/www/api/export_gcs.php index fab7fe2..72b3d14 100644 --- a/www/api/export_gcs.php +++ b/www/api/export_gcs.php @@ -8,7 +8,7 @@ require_once '../../src/SemanticScuttle/header.php'; if($GLOBALS['enableGoogleCustomSearch'] == false) { - echo "Google Custom Search disabled. You can enable it into the config.inc.php file."; + echo "Google Custom Search disabled. You can enable it into the config.php file."; die; } diff --git a/www/gsearch/context.php b/www/gsearch/context.php index 80c02cb..8b419da 100644 --- a/www/gsearch/context.php +++ b/www/gsearch/context.php @@ -2,7 +2,7 @@ require_once '../../src/SemanticScuttle/header.php'; if($GLOBALS['enableGoogleCustomSearch'] == false) { - echo "Google Custom Search disabled. You can enable it into the config.inc.php file."; + echo "Google Custom Search disabled. You can enable it into the config.php file."; die; } ?> diff --git a/www/gsearch/index.php b/www/gsearch/index.php index aabc56a..ec86787 100644 --- a/www/gsearch/index.php +++ b/www/gsearch/index.php @@ -1,7 +1,7 @@ <?php require_once '../../src/SemanticScuttle/header.php'; if($GLOBALS['enableGoogleCustomSearch']==false) { - echo "Google Custom Search disabled. You can enable it into the config.inc.php file."; + echo "Google Custom Search disabled. You can enable it into the config.php file."; die; } |