[FEATURE] Move config include into settings file

[jirafeau_mojo42.git] / lib / config.original.php

diff --git a/lib/config.original.php b/lib/config.original.php
index 6a5c1babada2672941538f0177b034b8023e60fb..30ec13495d56ba5d1670c4aa2e690b61f4eb6edb 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -24,7 +24,6 @@
  * To overwrite these settings copy the file,
  * rename it to »config.local.php« and adapt the parameters.
  **/
  * To overwrite these settings copy the file,
  * rename it to »config.local.php« and adapt the parameters.
  **/

-global $cfg;

 
 /* URL of installation, with traling slash (eg. »https://exmaple.com/jirafeau/«)
  */
 
 /* URL of installation, with traling slash (eg. »https://exmaple.com/jirafeau/«)
  */


@@ -133,11 +132,4 @@ $cfg['proxy_ip'] = array();
  */
 $cfg['installation_done'] = false;
 
  */
 $cfg['installation_done'] = false;
 

-/* Try to include user's local configuration. */
-if ((basename (__FILE__) != 'config.local.php')
-    && file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
-{
-    require (JIRAFEAU_ROOT.'lib/config.local.php');
-}
-
-?>
+?>
\ No newline at end of file