Skip to content

Commit 0854d91

Browse files
author
Phil Sturgeon
committed
Merged tip.
2 parents 0cb8c59 + 3ef65bd commit 0854d91

File tree

262 files changed

+3848
-3034
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+3848
-3034
lines changed

‎.hgflow

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[Basic]
2+
develop = develop
3+
feature = feature/
4+
version_tag =
5+
publish = default
6+
release = release/
7+
hotfix = hotfix/
8+

‎application/config/autoload.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/*
33
| -------------------------------------------------------------------
44
| AUTO-LOADER
@@ -8,7 +8,7 @@
88
| In order to keep the framework as light-weight as possible only the
99
| absolute minimal resources are loaded by default. For example,
1010
| the database is not connected to automatically since no assumption
11-
| is made regarding whether you intend to use it. This file lets
11+
| is made regarding whether you intend to use it. This file lets
1212
| you globally define which systems you would like loaded with every
1313
| request.
1414
|
@@ -29,20 +29,20 @@
2929

3030
/*
3131
| -------------------------------------------------------------------
32-
| Auto-load Packges
32+
| Auto-load Packges
3333
| -------------------------------------------------------------------
3434
| Prototype:
3535
|
36-
| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
36+
| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
3737
|
3838
*/
3939

40-
$autoload['packages'] = array(APPPATH.'third_party');
40+
$autoload['packages'] = array();
4141

4242

4343
/*
4444
| -------------------------------------------------------------------
45-
| Auto-load Libraries
45+
| Auto-load Libraries
4646
| -------------------------------------------------------------------
4747
| These are the classes located in the system/libraries folder
4848
| or in your application/libraries folder.
@@ -57,7 +57,7 @@
5757

5858
/*
5959
| -------------------------------------------------------------------
60-
| Auto-load Helper Files
60+
| Auto-load Helper Files
6161
| -------------------------------------------------------------------
6262
| Prototype:
6363
|
@@ -69,14 +69,14 @@
6969

7070
/*
7171
| -------------------------------------------------------------------
72-
| Auto-load Config files
72+
| Auto-load Config files
7373
| -------------------------------------------------------------------
7474
| Prototype:
7575
|
7676
| $autoload['config'] = array('config1', 'config2');
7777
|
7878
| NOTE: This item is intended for use ONLY if you have created custom
79-
| config files. Otherwise, leave it blank.
79+
| config files. Otherwise, leave it blank.
8080
|
8181
*/
8282

@@ -85,13 +85,13 @@
8585

8686
/*
8787
| -------------------------------------------------------------------
88-
| Auto-load Language files
88+
| Auto-load Language files
8989
| -------------------------------------------------------------------
9090
| Prototype:
9191
|
9292
| $autoload['language'] = array('lang1', 'lang2');
9393
|
94-
| NOTE: Do not include the "_lang" part of your file. For example
94+
| NOTE: Do not include the "_lang" part of your file. For example
9595
| "codeigniter_lang.php" would be referenced as array('codeigniter');
9696
|
9797
*/
@@ -101,7 +101,7 @@
101101

102102
/*
103103
| -------------------------------------------------------------------
104-
| Auto-load Models
104+
| Auto-load Models
105105
| -------------------------------------------------------------------
106106
| Prototype:
107107
|

‎application/config/config.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22

33
/*
44
|--------------------------------------------------------------------------
@@ -34,7 +34,7 @@
3434
|--------------------------------------------------------------------------
3535
|
3636
| This item determines which server global should be used to retrieve the
37-
| URI string. The default setting of 'AUTO' works for most servers.
37+
| URI string. The default setting of 'AUTO' works for most servers.
3838
| If your links do not seem to work, try one of the other delicious flavors:
3939
|
4040
| 'AUTO' Default - auto detects
@@ -88,7 +88,7 @@
8888
|--------------------------------------------------------------------------
8989
|
9090
| If you would like to use the 'hooks' feature you must enable it by
91-
| setting this variable to TRUE (boolean). See the user guide for details.
91+
| setting this variable to TRUE (boolean). See the user guide for details.
9292
|
9393
*/
9494
$config['enable_hooks'] = FALSE;
@@ -100,7 +100,7 @@
100100
|--------------------------------------------------------------------------
101101
|
102102
| This item allows you to set the filename/classname prefix when extending
103-
| native libraries. For more information please see the user guide:
103+
| native libraries. For more information please see the user guide:
104104
|
105105
| http://codeigniter.com/user_guide/general/core_classes.html
106106
| http://codeigniter.com/user_guide/general/creating_libraries.html
@@ -115,11 +115,11 @@
115115
|--------------------------------------------------------------------------
116116
|
117117
| This lets you specify with a regular expression which characters are permitted
118-
| within your URLs. When someone tries to submit a URL with disallowed
118+
| within your URLs. When someone tries to submit a URL with disallowed
119119
| characters they will get a warning message.
120120
|
121121
| As a security measure you are STRONGLY encouraged to restrict URLs to
122-
| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
122+
| as few characters as possible. By default only these are allowed: a-z 0-9~%.:_-
123123
|
124124
| Leave blank to allow all characters -- but only if you are insane.
125125
|
@@ -137,7 +137,7 @@
137137
| By default CodeIgniter uses search-engine friendly segment based URLs:
138138
| example.com/who/what/where/
139139
|
140-
| By default CodeIgniter enables access to the $_GET array. If for some
140+
| By default CodeIgniter enables access to the $_GET array. If for some
141141
| reason you would like to disable it, set 'allow_get_array' to FALSE.
142142
|
143143
| You can optionally enable standard query string based URLs:
@@ -210,7 +210,7 @@
210210
|--------------------------------------------------------------------------
211211
|
212212
| Leave this BLANK unless you would like to set something other than the default
213-
| system/cache/ folder. Use a full server path with trailing slash.
213+
| system/cache/ folder. Use a full server path with trailing slash.
214214
|
215215
*/
216216
$config['cache_path'] = '';
@@ -221,7 +221,7 @@
221221
|--------------------------------------------------------------------------
222222
|
223223
| If you use the Encryption class or the Session class you
224-
| MUST set an encryption key. See the user guide for info.
224+
| MUST set an encryption key. See the user guide for info.
225225
|
226226
*/
227227
$config['encryption_key'] = '';
@@ -233,9 +233,9 @@
233233
|
234234
| 'sess_cookie_name' = the name you want for the cookie
235235
| 'sess_expiration' = the number of SECONDS you want the session to last.
236-
| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
236+
| by default sessions last 7200 seconds (two hours). Set to zero for no expiration.
237237
| 'sess_expire_on_close' = Whether to cause the session to expire automatically
238-
| when the browser window is closed
238+
| when the browser window is closed
239239
| 'sess_encrypt_cookie' = Whether to encrypt the cookie
240240
| 'sess_use_database' = Whether to save the session data to a database
241241
| 'sess_table_name' = The name of the session database table
@@ -261,8 +261,8 @@
261261
|
262262
| 'cookie_prefix' = Set a prefix if you need to avoid collisions
263263
| 'cookie_domain' = Set to .your-domain.com for site-wide cookies
264-
| 'cookie_path' = Typically will be a forward slash
265-
| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
264+
| 'cookie_path' = Typically will be a forward slash
265+
| 'cookie_secure' = Cookies will only be set if a secure HTTPS connection exists.
266266
|
267267
*/
268268
$config['cookie_prefix'] = "";
@@ -303,16 +303,16 @@
303303
| Output Compression
304304
|--------------------------------------------------------------------------
305305
|
306-
| Enables Gzip output compression for faster page loads. When enabled,
306+
| Enables Gzip output compression for faster page loads. When enabled,
307307
| the output class will test whether your server supports Gzip.
308308
| Even if it does, however, not all browsers support compression
309309
| so enable only if you are reasonably sure your visitors can handle it.
310310
|
311-
| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
311+
| VERY IMPORTANT: If you are getting a blank page when compression is enabled it
312312
| means you are prematurely outputting something to your browser. It could
313-
| even be a line of whitespace at the end of one of your scripts. For
313+
| even be a line of whitespace at the end of one of your scripts. For
314314
| compression to work, nothing can be sent before the output buffer is called
315-
| by the output class. Do not 'echo' any values with compression enabled.
315+
| by the output class. Do not 'echo' any values with compression enabled.
316316
|
317317
*/
318318
$config['compress_output'] = FALSE;
@@ -322,9 +322,9 @@
322322
| Master Time Reference
323323
|--------------------------------------------------------------------------
324324
|
325-
| Options are 'local' or 'gmt'. This pref tells the system whether to use
325+
| Options are 'local' or 'gmt'. This pref tells the system whether to use
326326
| your server's local time as the master 'now' reference, or convert it to
327-
| GMT. See the 'date helper' page of the user guide for information
327+
| GMT. See the 'date helper' page of the user guide for information
328328
| regarding date handling.
329329
|
330330
*/
@@ -338,7 +338,7 @@
338338
|
339339
| If your PHP installation does not have short tag support enabled CI
340340
| can rewrite the tags on-the-fly, enabling you to utilize that syntax
341-
| in your view files. Options are TRUE or FALSE (boolean)
341+
| in your view files. Options are TRUE or FALSE (boolean)
342342
|
343343
*/
344344
$config['rewrite_short_tags'] = FALSE;

‎application/config/constants.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22

33
/*
44
|--------------------------------------------------------------------------
55
| File and Directory Modes
66
|--------------------------------------------------------------------------
77
|
88
| These prefs are used when checking and setting modes when working
9-
| with the file system. The defaults are fine on servers with proper
9+
| with the file system. The defaults are fine on servers with proper
1010
| security, but you may wish (or even need) to change the values in
1111
| certain environments (Apache running a separate process for each
12-
| user, PHP under CGI with Apache suEXEC, etc.). Octal values should
12+
| user, PHP under CGI with Apache suEXEC, etc.). Octal values should
1313
| always be used to set the mode correctly.
1414
|
1515
*/

‎application/config/database.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/*
33
| -------------------------------------------------------------------
44
| DATABASE CONNECTIVITY SETTINGS
@@ -16,23 +16,29 @@
1616
| ['username'] The username used to connect to the database
1717
| ['password'] The password used to connect to the database
1818
| ['database'] The name of the database you want to connect to
19-
| ['dbdriver'] The database type. ie: mysql. Currently supported:
20-
mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
19+
| ['dbdriver'] The database type. ie: mysql. Currently supported:
20+
| mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
2121
| ['dbprefix'] You can add an optional prefix, which will be added
22-
| to the table name when using the Active Record class
22+
| to the table name when using the Active Record class
2323
| ['pconnect'] TRUE/FALSE - Whether to use a persistent connection
2424
| ['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
2525
| ['cache_on'] TRUE/FALSE - Enables/disables query caching
2626
| ['cachedir'] The path to the folder where cache files should be stored
2727
| ['char_set'] The character set used in communicating with the database
2828
| ['dbcollat'] The character collation used in communicating with the database
29+
| NOTE: For MySQL and MySQLi databases, this setting is only used
30+
| as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7.
31+
| There is an incompatibility in PHP with mysql_real_escape_string() which
32+
| can make your site vulnerable to SQL injection if you are using a
33+
| multi-byte character set and are running versions lower than these.
34+
| Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
2935
| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
3036
| ['autoinit'] Whether or not to automatically initialize the database.
3137
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
3238
| - good for ensuring strict SQL while developing
3339
|
3440
| The $active_group variable lets you choose which connection group to
35-
| make active. By default there is only one group (the 'default' group).
41+
| make active. By default there is only one group (the 'default' group).
3642
|
3743
| The $active_record variables lets you determine whether or not to load
3844
| the active record class

‎application/config/foreign_chars.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/*
33
| -------------------------------------------------------------------
44
| Foreign Characters

‎application/config/hooks.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/*
33
| -------------------------------------------------------------------------
44
| Hooks
55
| -------------------------------------------------------------------------
66
| This file lets you define "hooks" to extend CI without hacking the core
7-
| files. Please see the user guide for info:
7+
| files. Please see the user guide for info:
88
|
99
| http://codeigniter.com/user_guide/general/hooks.html
1010
|

‎application/config/mimes.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/*
33
| -------------------------------------------------------------------
44
| MIME TYPES
55
| -------------------------------------------------------------------
6-
| This file contains an array of mime types. It is used by the
6+
| This file contains an array of mime types. It is used by the
77
| Upload class to help identify allowed file types.
88
|
99
*/
@@ -51,7 +51,7 @@
5151
'tgz' => array('application/x-tar', 'application/x-gzip-compressed'),
5252
'xhtml' => 'application/xhtml+xml',
5353
'xht' => 'application/xhtml+xml',
54-
'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
54+
'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
5555
'mid' => 'audio/midi',
5656
'midi' => 'audio/midi',
5757
'mpga' => 'audio/mpeg',
@@ -71,7 +71,7 @@
7171
'jpeg' => array('image/jpeg', 'image/pjpeg'),
7272
'jpg' => array('image/jpeg', 'image/pjpeg'),
7373
'jpe' => array('image/jpeg', 'image/pjpeg'),
74-
'png' => array('image/png', 'image/x-png'),
74+
'png' => array('image/png', 'image/x-png'),
7575
'tiff' => 'image/tiff',
7676
'tif' => 'image/tiff',
7777
'css' => 'text/css',

‎application/config/profiler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/*
33
| -------------------------------------------------------------------------
44
| Profiler Sections

‎application/config/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
1+
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
22
/*
33
| -------------------------------------------------------------------------
44
| URI ROUTING

0 commit comments

Comments
 (0)