Merge in the hosted_migration_20130215 branch to the v0.3_work branch

git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1030 97e9348a-65ac-dc4b-aefc-98561f571b83
2013-12-05 01:24:21 +00:00
parent 20284046c3
commit 98d9849914
15 changed files with 65 additions and 84 deletions
--- a/site/webroot/index.php
+++ b/site/webroot/index.php
@@ -55,7 +55,7 @@
 *
 */
 	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-		define('CAKE_CORE_INCLUDE_PATH', 'D:\Website\localhost\CakePHP');
+		define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . APP_DIR . DS . 'CakePHP');
 	}

 /**