diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-01-11 18:39:06 +0100 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-01-11 18:39:06 +0100 |
| commit | c8e1de74b139dc7f3e776f7ebf98495ec5b780a6 (patch) | |
| tree | 51709a1855d570ba495d81a172a029015341c2bd /application/config/config.php | |
| parent | faa4890addbaa90254ef160813a08f727d069415 (diff) | |
| parent | 99f31e76bd06876cd3bf789f9d2774f79818b7df (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'application/config/config.php')
| -rw-r--r-- | application/config/config.php | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/application/config/config.php b/application/config/config.php index fc4547b9b..c45c66b1a 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.2.4 or newer + * An open source application development framework for PHP * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014, British Columbia Institute of Technology + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link http://codeigniter.com * @since Version 1.0.0 @@ -322,6 +322,17 @@ $config['cache_path'] = ''; /* |-------------------------------------------------------------------------- +| Cache Include Query String +|-------------------------------------------------------------------------- +| +| Set this to TRUE if you want to use different cache files depending on the +| URL query string. Please be aware this might result in numerous cache files. +| +*/ +$config['cache_query_string'] = FALSE; + +/* +|-------------------------------------------------------------------------- | Encryption Key |-------------------------------------------------------------------------- | @@ -455,18 +466,6 @@ $config['compress_output'] = FALSE; /* |-------------------------------------------------------------------------- -| Minify -|-------------------------------------------------------------------------- -| -| Removes extra characters (usually unnecessary spaces) from your -| output for faster page load speeds. Makes your outputted HTML source -| code less readable. -| -*/ -$config['minify_output'] = FALSE; - -/* -|-------------------------------------------------------------------------- | Master Time Reference |-------------------------------------------------------------------------- | @@ -478,7 +477,6 @@ $config['minify_output'] = FALSE; */ $config['time_reference'] = 'local'; - /* |-------------------------------------------------------------------------- | Rewrite PHP Short Tags |