[phpwiki-checkins] SF.net SVN: phpwiki:[8269] trunk/g

[<var...@us...>]

Revision: 8269
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8269&view=rev
Author:   vargenau
Date:     2012-05-31 08:31:46 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Use forge_get_config

Modified Paths:
--------------
    trunk/g

Modified: trunk/g
===================================================================
--- trunk/g	2012-04-14 16:59:41 UTC (rev 8268)
+++ trunk/g	2012-05-31 08:31:46 UTC (rev 8269)
@@ -47,7 +47,7 @@
 // Disable compression, seems needed to get all the messages.
 $no_gz_buffer=true;
 
-require_once('../../env.inc.php');
+require_once('../../../common/include/env.inc.php');
 require_once $gfcommon.'include/pre.php';
 require_once $gfplugins.'wiki/common/wikiconfig.class.php';
 
@@ -122,7 +122,7 @@
     // Disable access log (already in Apache & FusionForge).
     define('ACCESS_LOG_SQL', 0);
 
-    define('DEBUG', ($sys_install_type != 'production'));
+    define('DEBUG', (forge_get_config('installation_environment') != 'production'));
 
     // Postgresql
     define('DATABASE_TYPE', 'SQL');
@@ -244,8 +244,8 @@
     // Override the default configuration for VARIABLES after index.php:
     // E.g. Use another DB:
     $DBParams['dbtype'] = 'SQL';
-    $DBParams['dsn']    = 'ffpgsql://' . $sys_dbuser . ':' .
-        $sys_dbpasswd . '@' . $sys_dbhost .'/' . $sys_dbname;
+    $DBParams['dsn']    = 'ffpgsql://' . forge_get_config('database_user') . ':' .
+        forge_get_config('database_password') . '@' . forge_get_config('database_host') .'/' . forge_get_config('database_name');
 
     $DBParams['prefix'] = "plugin_wiki_";
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.