Completed
Branch master (fc8cf3)
by Angus
10:14
created
application/config/routes.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 /*
4 4
 | -------------------------------------------------------------------------
Please login to merge, or discard this patch.
application/config/mimes.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
 	'jpeg'	=>	array('image/jpeg', 'image/pjpeg'),
77 77
 	'jpg'	=>	array('image/jpeg', 'image/pjpeg'),
78 78
 	'jpe'	=>	array('image/jpeg', 'image/pjpeg'),
79
-	'png'	=>	array('image/png',  'image/x-png'),
79
+	'png'	=>	array('image/png', 'image/x-png'),
80 80
 	'tiff'	=>	'image/tiff',
81 81
 	'tif'	=>	'image/tiff',
82 82
 	'css'	=>	array('text/css', 'text/plain'),
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 /*
4 4
 | -------------------------------------------------------------------
Please login to merge, or discard this patch.
application/config/doctypes.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 
4 4
 $_doctypes = array(
5 5
 	'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
Please login to merge, or discard this patch.
application/config/recaptcha.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 /**
4 4
  * Recaptcha configuration settings
Please login to merge, or discard this patch.
application/config/smileys.php 2 patches
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -17,48 +17,48 @@
 block discarded – undo
17 17
 
18 18
 //	smiley			image name						width	height	alt
19 19
 
20
-	':-)'			=>	array('grin.gif',			'19',	'19',	'grin'),
21
-	':lol:'			=>	array('lol.gif',			'19',	'19',	'LOL'),
22
-	':cheese:'		=>	array('cheese.gif',			'19',	'19',	'cheese'),
23
-	':)'			=>	array('smile.gif',			'19',	'19',	'smile'),
24
-	';-)'			=>	array('wink.gif',			'19',	'19',	'wink'),
25
-	';)'			=>	array('wink.gif',			'19',	'19',	'wink'),
26
-	':smirk:'		=>	array('smirk.gif',			'19',	'19',	'smirk'),
27
-	':roll:'		=>	array('rolleyes.gif',		'19',	'19',	'rolleyes'),
28
-	':-S'			=>	array('confused.gif',		'19',	'19',	'confused'),
29
-	':wow:'			=>	array('surprise.gif',		'19',	'19',	'surprised'),
30
-	':bug:'			=>	array('bigsurprise.gif',	'19',	'19',	'big surprise'),
31
-	':-P'			=>	array('tongue_laugh.gif',	'19',	'19',	'tongue laugh'),
32
-	'%-P'			=>	array('tongue_rolleye.gif',	'19',	'19',	'tongue rolleye'),
33
-	';-P'			=>	array('tongue_wink.gif',	'19',	'19',	'tongue wink'),
34
-	':P'			=>	array('raspberry.gif',		'19',	'19',	'raspberry'),
35
-	':blank:'		=>	array('blank.gif',			'19',	'19',	'blank stare'),
36
-	':long:'		=>	array('longface.gif',		'19',	'19',	'long face'),
37
-	':ohh:'			=>	array('ohh.gif',			'19',	'19',	'ohh'),
38
-	':grrr:'		=>	array('grrr.gif',			'19',	'19',	'grrr'),
39
-	':gulp:'		=>	array('gulp.gif',			'19',	'19',	'gulp'),
40
-	'8-/'			=>	array('ohoh.gif',			'19',	'19',	'oh oh'),
41
-	':down:'		=>	array('downer.gif',			'19',	'19',	'downer'),
42
-	':red:'			=>	array('embarrassed.gif',	'19',	'19',	'red face'),
43
-	':sick:'		=>	array('sick.gif',			'19',	'19',	'sick'),
44
-	':shut:'		=>	array('shuteye.gif',		'19',	'19',	'shut eye'),
45
-	':-/'			=>	array('hmm.gif',			'19',	'19',	'hmmm'),
46
-	'>:('			=>	array('mad.gif',			'19',	'19',	'mad'),
47
-	':mad:'			=>	array('mad.gif',			'19',	'19',	'mad'),
48
-	'>:-('			=>	array('angry.gif',			'19',	'19',	'angry'),
49
-	':angry:'		=>	array('angry.gif',			'19',	'19',	'angry'),
50
-	':zip:'			=>	array('zip.gif',			'19',	'19',	'zipper'),
51
-	':kiss:'		=>	array('kiss.gif',			'19',	'19',	'kiss'),
52
-	':ahhh:'		=>	array('shock.gif',			'19',	'19',	'shock'),
53
-	':coolsmile:'	=>	array('shade_smile.gif',	'19',	'19',	'cool smile'),
54
-	':coolsmirk:'	=>	array('shade_smirk.gif',	'19',	'19',	'cool smirk'),
55
-	':coolgrin:'	=>	array('shade_grin.gif',		'19',	'19',	'cool grin'),
56
-	':coolhmm:'		=>	array('shade_hmm.gif',		'19',	'19',	'cool hmm'),
57
-	':coolmad:'		=>	array('shade_mad.gif',		'19',	'19',	'cool mad'),
58
-	':coolcheese:'	=>	array('shade_cheese.gif',	'19',	'19',	'cool cheese'),
59
-	':vampire:'		=>	array('vampire.gif',		'19',	'19',	'vampire'),
60
-	':snake:'		=>	array('snake.gif',			'19',	'19',	'snake'),
61
-	':exclaim:'		=>	array('exclaim.gif',		'19',	'19',	'exclaim'),
62
-	':question:'	=>	array('question.gif',		'19',	'19',	'question')
20
+	':-)'			=>	array('grin.gif', '19', '19', 'grin'),
21
+	':lol:'			=>	array('lol.gif', '19', '19', 'LOL'),
22
+	':cheese:'		=>	array('cheese.gif', '19', '19', 'cheese'),
23
+	':)'			=>	array('smile.gif', '19', '19', 'smile'),
24
+	';-)'			=>	array('wink.gif', '19', '19', 'wink'),
25
+	';)'			=>	array('wink.gif', '19', '19', 'wink'),
26
+	':smirk:'		=>	array('smirk.gif', '19', '19', 'smirk'),
27
+	':roll:'		=>	array('rolleyes.gif', '19', '19', 'rolleyes'),
28
+	':-S'			=>	array('confused.gif', '19', '19', 'confused'),
29
+	':wow:'			=>	array('surprise.gif', '19', '19', 'surprised'),
30
+	':bug:'			=>	array('bigsurprise.gif', '19', '19', 'big surprise'),
31
+	':-P'			=>	array('tongue_laugh.gif', '19', '19', 'tongue laugh'),
32
+	'%-P'			=>	array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'),
33
+	';-P'			=>	array('tongue_wink.gif', '19', '19', 'tongue wink'),
34
+	':P'			=>	array('raspberry.gif', '19', '19', 'raspberry'),
35
+	':blank:'		=>	array('blank.gif', '19', '19', 'blank stare'),
36
+	':long:'		=>	array('longface.gif', '19', '19', 'long face'),
37
+	':ohh:'			=>	array('ohh.gif', '19', '19', 'ohh'),
38
+	':grrr:'		=>	array('grrr.gif', '19', '19', 'grrr'),
39
+	':gulp:'		=>	array('gulp.gif', '19', '19', 'gulp'),
40
+	'8-/'			=>	array('ohoh.gif', '19', '19', 'oh oh'),
41
+	':down:'		=>	array('downer.gif', '19', '19', 'downer'),
42
+	':red:'			=>	array('embarrassed.gif', '19', '19', 'red face'),
43
+	':sick:'		=>	array('sick.gif', '19', '19', 'sick'),
44
+	':shut:'		=>	array('shuteye.gif', '19', '19', 'shut eye'),
45
+	':-/'			=>	array('hmm.gif', '19', '19', 'hmmm'),
46
+	'>:('			=>	array('mad.gif', '19', '19', 'mad'),
47
+	':mad:'			=>	array('mad.gif', '19', '19', 'mad'),
48
+	'>:-('			=>	array('angry.gif', '19', '19', 'angry'),
49
+	':angry:'		=>	array('angry.gif', '19', '19', 'angry'),
50
+	':zip:'			=>	array('zip.gif', '19', '19', 'zipper'),
51
+	':kiss:'		=>	array('kiss.gif', '19', '19', 'kiss'),
52
+	':ahhh:'		=>	array('shock.gif', '19', '19', 'shock'),
53
+	':coolsmile:'	=>	array('shade_smile.gif', '19', '19', 'cool smile'),
54
+	':coolsmirk:'	=>	array('shade_smirk.gif', '19', '19', 'cool smirk'),
55
+	':coolgrin:'	=>	array('shade_grin.gif', '19', '19', 'cool grin'),
56
+	':coolhmm:'		=>	array('shade_hmm.gif', '19', '19', 'cool hmm'),
57
+	':coolmad:'		=>	array('shade_mad.gif', '19', '19', 'cool mad'),
58
+	':coolcheese:'	=>	array('shade_cheese.gif', '19', '19', 'cool cheese'),
59
+	':vampire:'		=>	array('vampire.gif', '19', '19', 'vampire'),
60
+	':snake:'		=>	array('snake.gif', '19', '19', 'snake'),
61
+	':exclaim:'		=>	array('exclaim.gif', '19', '19', 'exclaim'),
62
+	':question:'	=>	array('question.gif', '19', '19', 'question')
63 63
 
64 64
 );
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 
4 4
 /*
5 5
 | -------------------------------------------------------------------
Please login to merge, or discard this patch.
application/config/config.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 |
48 48
 | WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
49 49
 */
50
-$config['uri_protocol']	= 'REQUEST_URI';
50
+$config['uri_protocol'] = 'REQUEST_URI';
51 51
 
52 52
 /*
53 53
 |--------------------------------------------------------------------------
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 | than english.
72 72
 |
73 73
 */
74
-$config['language']	= 'english';
74
+$config['language'] = 'english';
75 75
 
76 76
 /*
77 77
 |--------------------------------------------------------------------------
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 | Note: This will NOT disable or override the CodeIgniter-specific
132 132
 |	autoloading (application/config/autoload.php)
133 133
 */
134
-$config['composer_autoload'] = realpath(APPPATH . '../vendor/autoload.php');
134
+$config['composer_autoload'] = realpath(APPPATH.'../vendor/autoload.php');
135 135
 
136 136
 /*
137 137
 |--------------------------------------------------------------------------
@@ -387,9 +387,9 @@  discard block
 block discarded – undo
387 387
 */
388 388
 $config['cookie_prefix']	= '';
389 389
 $config['cookie_domain']	= '';
390
-$config['cookie_path']		= '/';
390
+$config['cookie_path'] = '/';
391 391
 $config['cookie_secure']	= TRUE;
392
-$config['cookie_httponly'] 	= FALSE;
392
+$config['cookie_httponly'] = FALSE;
393 393
 
394 394
 /*
395 395
 |--------------------------------------------------------------------------
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-defined('BASEPATH') OR exit('No direct script access allowed');
2
+defined('BASEPATH') or exit('No direct script access allowed');
3 3
 
4 4
 /*
5 5
 |--------------------------------------------------------------------------
Please login to merge, or discard this patch.
application/config/production/database.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 $active_group = 'default';
4 4
 $query_builder = TRUE;
Please login to merge, or discard this patch.
application/config/database.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 /*
4 4
 | -------------------------------------------------------------------
Please login to merge, or discard this patch.
application/config/sites.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 $config['batoto_cookie_member_id']  = "";
4 4
 $config['batoto_cookie_pass_hash']  = "";
Please login to merge, or discard this patch.