Permalink
Browse files

Updated to 1.1.1

Fixed some incorrect comments (left over from 1.0.0 which was still private)
Added the config.env.php require to the master file (bug fix)
Removed some paths from require calls (no longer needed after 1.0.0)
Changed save_tmpl_files logic in master config file to just be set to 'y' all of the time. I commented out our standard logic for this setting so users could opt to use it if they wanted
  • Loading branch information...
1 parent b3dfd41 commit bc6a9591924972f1f91b17942304eb265da33209 @erikreagan erikreagan committed Oct 29, 2011
Showing with 21 additions and 10 deletions.
  1. +1 −1 config/config.dev.php
  2. +1 −1 config/config.env.php
  3. +1 −1 config/config.local.php
  4. +16 −5 config/config.master.php
  5. +1 −1 config/config.prod.php
  6. +1 −1 config/config.stage.php
View
@@ -6,7 +6,7 @@
* Our database credentials and any environment-specific overrides
*
* @package Focus Lab Master Config
- * @version 1.1
+ * @version 1.1.1
* @author Focus Lab, LLC <dev@focuslabllc.com>
*/
View
@@ -8,7 +8,7 @@
* index.php file and the back-end admin.php file to set the debug mode
*
* @package Focus Lab Master Config
- * @version 1.1
+ * @version 1.1.1
* @author Focus Lab, LLC <dev@focuslabllc.com>
*/
View
@@ -7,7 +7,7 @@
* This file should be specific to each developer and not tracked in Git
*
* @package Focus Lab Master Config
- * @version 1.1
+ * @version 1.1.1
* @author Focus Lab, LLC <dev@focuslabllc.com>
*/
View
@@ -11,8 +11,7 @@
*
* Some config settings are used in multiple (but not all) environments. You will
* see the use of conditionals around the ENV constant in this file. This constant is
- * defined in ./config/config.env.php which is required in the front-end index.php and the CP
- * admin.php files. This means the constant is available at all times in the APP page loads.
+ * defined in ./config/config.env.php
*
* All config files are stored in the ./config/ directory and this master file is "required"
* in system/expressionengine/config/config.php and system/expressionengine/config/database.php
@@ -24,12 +23,20 @@
* @link http://ee-garage.com/nsm-config-bootstrap
*
* @package Focus Lab Master Config
- * @version 1.1
+ * @version 1.1.1
* @author Focus Lab, LLC <dev@focuslabllc.com>
* @see https://github.com/focuslabllc/ee-master-config
*/
+// Require our environment declatation file if it hasn't
+// already been loaded in index.php or admin.php
+if ( ! defined('ENV'))
+{
+ require 'config.env.php';
+}
+
+
// Setup our initial arrays
$env_db = $env_config = $env_global = $master_global = array();
@@ -51,7 +58,7 @@
* @see config/config.stage.php
* @see config/config.prod.php
*/
- require $_SERVER['DOCUMENT_ROOT'] . '/../config/config.' . ENV . '.php';
+ require 'config.' . ENV . '.php';
// Dynamically set the cache path (Shouldn't this be done by default? Who moves the cache path?)
$env_db['cachedir'] = APPPATH . 'cache/db_cache/';
@@ -116,8 +123,12 @@
* Working locally we want to reference our template files.
* In staging and production we do not use flat files (for ever-so-slightly better performance)
* This approach requires that we synchronize templates after each deployment of template changes
+ *
+ * For the distributed Focus Lab, LLC Master Config file this is commented out
+ * You can enable this "feature" by uncommenting the second 'save_tmpl_files' line
*/
- $env_config['save_tmpl_files'] = (ENV == 'prod') ? 'n' : 'y';
+ $env_config['save_tmpl_files'] = 'y';
+ // $env_config['save_tmpl_files'] = (ENV == 'prod') ? 'n' : 'y';
$env_config['tmpl_file_basepath'] = $base_path . '/../templates';
$env_config['hidden_template_indicator'] = '_';
View
@@ -6,7 +6,7 @@
* Our database credentials and any environment-specific overrides
*
* @package Focus Lab Master Config
- * @version 1.1
+ * @version 1.1.1
* @author Focus Lab, LLC <dev@focuslabllc.com>
*/
View
@@ -6,7 +6,7 @@
* Our database credentials and any environment-specific overrides
*
* @package Focus Lab Master Config
- * @version 1.1
+ * @version 1.1.1
* @author Focus Lab, LLC <dev@focuslabllc.com>
*/

0 comments on commit bc6a959

Please sign in to comment.