Merge out from the pre_0.1 branch

git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@810 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-28 20:48:52 +00:00
parent fbc2de9427 7bcee943a5
commit 50eb7c0f5d
76 changed files with 2627 additions and 376 deletions
--- a/site/config/database.php
+++ b/site/config/database.php
@@ -12,7 +12,7 @@ class DATABASE_CONFIG {
 	);

 	function __construct() {
-		if (preg_match("%^/[^/]*sand/%", $_SERVER['REQUEST_URI']))
+		if (sandbox())
 			$this->default['database'] = 'pmgr_sand';
 	}
 }