diff options
author | Andrey Andreev <narf@devilix.net> | 2015-07-05 12:16:12 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2015-07-05 12:16:12 +0200 |
commit | b28ae67ae212d52ac1a3970fbf42ef99ce09450a (patch) | |
tree | 072c9e4cbf56f9fc90037c2b655d070916e56414 /application/config | |
parent | a1170aff602317d9b6f2d5c1d5cc60d3dc82ee58 (diff) | |
parent | adf7636fb82a01ea4c9acf3322715a9e653e37fe (diff) |
Merge pull request #3953 from calvintam236/develop
[ci skip] Fix comment typos and strip some new lines
Diffstat (limited to 'application/config')
-rw-r--r-- | application/config/autoload.php | 13 | ||||
-rw-r--r-- | application/config/config.php | 7 | ||||
-rw-r--r-- | application/config/constants.php | 1 | ||||
-rw-r--r-- | application/config/database.php | 1 | ||||
-rw-r--r-- | application/config/mimes.php | 1 | ||||
-rw-r--r-- | application/config/smileys.php | 1 | ||||
-rw-r--r-- | application/config/user_agents.php | 1 |
7 files changed, 2 insertions, 23 deletions
diff --git a/application/config/autoload.php b/application/config/autoload.php index 72f855c8b..3f0bd24f2 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -39,10 +39,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared'); | */ - $autoload['packages'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Libraries @@ -59,10 +57,8 @@ $autoload['packages'] = array(); | | $autoload['libraries'] = array('user_agent' => 'ua'); */ - $autoload['libraries'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Drivers @@ -75,10 +71,8 @@ $autoload['libraries'] = array(); | | $autoload['drivers'] = array('cache'); */ - $autoload['drivers'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Helper Files @@ -87,10 +81,8 @@ $autoload['drivers'] = array(); | | $autoload['helper'] = array('url', 'file'); */ - $autoload['helper'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Config files @@ -103,10 +95,8 @@ $autoload['helper'] = array(); | config files. Otherwise, leave it blank. | */ - $autoload['config'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Language files @@ -119,10 +109,8 @@ $autoload['config'] = array(); | "codeigniter_lang.php" would be referenced as array('codeigniter'); | */ - $autoload['language'] = array(); - /* | ------------------------------------------------------------------- | Auto-load Models @@ -136,5 +124,4 @@ $autoload['language'] = array(); | | $autoload['model'] = array('first_model' => 'first'); */ - $autoload['model'] = array(); diff --git a/application/config/config.php b/application/config/config.php index 94e5d28a9..86ca312b7 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -58,7 +58,6 @@ $config['uri_protocol'] = 'REQUEST_URI'; | | http://codeigniter.com/user_guide/general/urls.html */ - $config['url_suffix'] = ''; /* @@ -155,7 +154,6 @@ $config['composer_autoload'] = FALSE; */ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-'; - /* |-------------------------------------------------------------------------- | Enable Query Strings @@ -325,7 +323,7 @@ $config['encryption_key'] = ''; | | 'sess_save_path' | -| The location to save sessions to, driver dependant. +| The location to save sessions to, driver dependent. | | For the 'files' driver, it's a path to a writable directory. | WARNING: Only absolute paths are supported! @@ -388,7 +386,7 @@ $config['cookie_httponly'] = FALSE; |-------------------------------------------------------------------------- | | Determines whether to standardize newline characters in input data, -| meaning to replace \r\n, \r, \n occurences with the PHP_EOL value. +| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value. | | This is particularly useful for portability between UNIX-based OSes, | (usually \n) and Windows (\r\n). @@ -478,7 +476,6 @@ $config['time_reference'] = 'local'; */ $config['rewrite_short_tags'] = FALSE; - /* |-------------------------------------------------------------------------- | Reverse Proxy IPs diff --git a/application/config/constants.php b/application/config/constants.php index 01096c74a..48283e223 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -27,7 +27,6 @@ define('DIR_WRITE_MODE', 0755); | These modes are used when working with fopen()/popen() | */ - define('FOPEN_READ', 'rb'); define('FOPEN_READ_WRITE', 'r+b'); define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care diff --git a/application/config/database.php b/application/config/database.php index fc3a5e5b6..84aab9169 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -58,7 +58,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | The $query_builder variables lets you determine whether or not to load | the query builder class. */ - $active_group = 'default'; $query_builder = TRUE; diff --git a/application/config/mimes.php b/application/config/mimes.php index f9b74bfb2..d0e1516ff 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -9,7 +9,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | Upload class to help identify allowed file types. | */ - return array( 'hqx' => array('application/mac-binhex40', 'application/mac-binhex', 'application/x-binhex40', 'application/x-mac-binhex40'), 'cpt' => 'application/mac-compactpro', diff --git a/application/config/smileys.php b/application/config/smileys.php index 1428d68bc..1eeba4776 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -13,7 +13,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | http://codeigniter.com/user_guide/helpers/smiley_helper.html | */ - $smileys = array( // smiley image name width height alt diff --git a/application/config/user_agents.php b/application/config/user_agents.php index fd8ed48cd..1129dbacd 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -10,7 +10,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | mobile device data. The array keys are used to identify the device | and the array values are used to set the actual name of the item. */ - $platforms = array( 'windows nt 10.0' => 'Windows 10', 'windows nt 6.3' => 'Windows 8.1', |