summaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-25 14:24:06 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-25 14:24:06 +0200
commitbe72bd2d1cdba222bbbce547e1603de1e4ec7961 (patch)
tree850711b8f4e981fcd1bf51151b1d71d53f630076 /index.php
parent4bc4c1476344f96ebb920677f608cb185a48eaed (diff)
parent9ff6336415f3da2a81142cb23343060df6196ebe (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'index.php')
-rw-r--r--index.php35
1 files changed, 34 insertions, 1 deletions
diff --git a/index.php b/index.php
index f4ac11a72..c50cfed43 100644
--- a/index.php
+++ b/index.php
@@ -33,7 +33,7 @@ if (defined('ENVIRONMENT'))
switch (ENVIRONMENT)
{
case 'development':
- error_reporting(E_ALL);
+ error_reporting(-1);
break;
case 'testing':
@@ -73,6 +73,23 @@ if (defined('ENVIRONMENT'))
*
*/
$application_folder = 'application';
+
+/*
+ *---------------------------------------------------------------
+ * VIEW FOLDER NAME
+ *---------------------------------------------------------------
+ *
+ * If you want to move the view folder out of the application
+ * folder set the path to the folder here. The folder can be renamed
+ * and relocated anywhere on your server. If blank, it will default
+ * to the standard location inside your application folder. If you
+ * do move this, use the full server path to this folder
+ *
+ * NO TRAILING SLASH!
+ *
+ */
+ $view_folder = '';
+
/*
* --------------------------------------------------------------------
@@ -190,6 +207,22 @@ if (defined('ENVIRONMENT'))
define('APPPATH', BASEPATH.$application_folder.'/');
}
+
+ // The path to the "views" folder
+ if (is_dir($view_folder))
+ {
+ define ('VIEWPATH', $view_folder .'/');
+ }
+ else
+ {
+ if ( ! is_dir(APPPATH.'views/'))
+ {
+ exit("Your view folder path does not appear to be set correctly. Please open the following file and correct this: ".SELF);
+ }
+
+ define ('VIEWPATH', APPPATH.'views/' );
+ }
+
/*
* --------------------------------------------------------------------