Completed
Pull Request — master (#161)
by Kenji
02:26
created
application/tests/_ci_phpunit_test/patcher/Patcher/ConstantPatcher.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -173,13 +173,11 @@
 block discarded – undo
173 173
 			if (is_string($token))
174 174
 			{
175 175
 				$new_source .= $token;
176
-			}
177
-			elseif ($i == $replacement['key'])
176
+			} elseif ($i == $replacement['key'])
178 177
 			{
179 178
 				$new_source .= $replacement['value'];
180 179
 				$replacement = each(self::$replacement);
181
-			}
182
-			else
180
+			} else
183 181
 			{
184 182
 				$new_source .= $token[1];
185 183
 			}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/Input.php 1 patch
Braces   +17 added lines, -25 removed lines patch added patch discarded remove patch
@@ -196,29 +196,30 @@  discard block
 block discarded – undo
196 196
 		if (isset($array[$index]))
197 197
 		{
198 198
 			$value = $array[$index];
199
-		}
200
-		elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation
199
+		} elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
200
+			// Does the index contain array notation
201 201
 		{
202 202
 			$value = $array;
203
+		}
203 204
 			for ($i = 0; $i < $count; $i++)
204 205
 			{
205 206
 				$key = trim($matches[0][$i], '[]');
206
-				if ($key === '') // Empty notation will return the value as array
207
+				if ($key === '') {
208
+					// Empty notation will return the value as array
207 209
 				{
208 210
 					break;
209 211
 				}
212
+				}
210 213
 
211 214
 				if (isset($value[$key]))
212 215
 				{
213 216
 					$value = $value[$key];
214
-				}
215
-				else
217
+				} else
216 218
 				{
217 219
 					return NULL;
218 220
 				}
219 221
 			}
220
-		}
221
-		else
222
+		} else
222 223
 		{
223 224
 			return NULL;
224 225
 		}
@@ -403,8 +404,7 @@  discard block
 block discarded – undo
403 404
 		if ( ! is_numeric($expire))
404 405
 		{
405 406
 			$expire = time() - 86500;
406
-		}
407
-		else
407
+		} else
408 408
 		{
409 409
 			$expire = ($expire > 0) ? time() + $expire : 0;
410 410
 		}
@@ -463,8 +463,7 @@  discard block
 block discarded – undo
463 463
 					if ( ! $this->valid_ip($spoof))
464 464
 					{
465 465
 						$spoof = NULL;
466
-					}
467
-					else
466
+					} else
468 467
 					{
469 468
 						break;
470 469
 					}
@@ -517,8 +516,7 @@  discard block
 block discarded – undo
517 516
 							}
518 517
 
519 518
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
520
-						}
521
-						else
519
+						} else
522 520
 						{
523 521
 							$ip = explode('.', $this->ip_address);
524 522
 							$sprintf = '%08b%08b%08b%08b';
@@ -538,8 +536,7 @@  discard block
 block discarded – undo
538 536
 						{
539 537
 							$netaddr[$i] = intval($netaddr[$j], 16);
540 538
 						}
541
-					}
542
-					else
539
+					} else
543 540
 					{
544 541
 						$netaddr = explode('.', $netaddr);
545 542
 					}
@@ -620,8 +617,7 @@  discard block
 block discarded – undo
620 617
 		if ($this->_allow_get_array === FALSE)
621 618
 		{
622 619
 			$_GET = array();
623
-		}
624
-		elseif (is_array($_GET))
620
+		} elseif (is_array($_GET))
625 621
 		{
626 622
 			foreach ($_GET as $key => $val)
627 623
 			{
@@ -657,8 +653,7 @@  discard block
 block discarded – undo
657 653
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
658 654
 				{
659 655
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
660
-				}
661
-				else
656
+				} else
662 657
 				{
663 658
 					unset($_COOKIE[$key]);
664 659
 				}
@@ -744,8 +739,7 @@  discard block
 block discarded – undo
744 739
 			if ($fatal === TRUE)
745 740
 			{
746 741
 				return FALSE;
747
-			}
748
-			else
742
+			} else
749 743
 			{
750 744
 				set_status_header(503);
751 745
 				echo 'Disallowed Key Characters.';
@@ -782,8 +776,7 @@  discard block
 block discarded – undo
782 776
 		if (function_exists('apache_request_headers'))
783 777
 		{
784 778
 			$this->headers = apache_request_headers();
785
-		}
786
-		else
779
+		} else
787 780
 		{
788 781
 			isset($_SERVER['CONTENT_TYPE']) && $this->headers['Content-Type'] = $_SERVER['CONTENT_TYPE'];
789 782
 
@@ -904,8 +897,7 @@  discard block
 block discarded – undo
904 897
 		{
905 898
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
906 899
 			return $this->_raw_input_stream;
907
-		}
908
-		elseif ($name === 'ip_address')
900
+		} elseif ($name === 'ip_address')
909 901
 		{
910 902
 			return $this->ip_address;
911 903
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestDouble.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,8 +48,7 @@
 block discarded – undo
48 48
 		if ($constructor_params === false)
49 49
 		{
50 50
 			$mock->disableOriginalConstructor();
51
-		}
52
-		elseif (is_array($constructor_params))
51
+		} elseif (is_array($constructor_params))
53 52
 		{
54 53
 			$mock->setConstructorArgs($constructor_params);
55 54
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/CodeIgniter.php 1 patch
Braces   +10 added lines, -20 removed lines patch added patch discarded remove patch
@@ -169,12 +169,10 @@  discard block
 block discarded – undo
169 169
 			file_exists(APPPATH.'vendor/autoload.php')
170 170
 				? require_once(APPPATH.'vendor/autoload.php')
171 171
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
172
-		}
173
-		elseif (file_exists($composer_autoload))
172
+		} elseif (file_exists($composer_autoload))
174 173
 		{
175 174
 			require_once($composer_autoload);
176
-		}
177
-		else
175
+		} else
178 176
 		{
179 177
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
180 178
 		}
@@ -253,8 +251,7 @@  discard block
 block discarded – undo
253 251
 		// This is required for mb_convert_encoding() to strip invalid characters.
254 252
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
255 253
 		mb_substitute_character('none');
256
-	}
257
-	else
254
+	} else
258 255
 	{
259 256
 		define('MB_ENABLED', FALSE);
260 257
 	}
@@ -267,8 +264,7 @@  discard block
 block discarded – undo
267 264
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
268 265
 		// and it's usage triggers E_DEPRECATED messages.
269 266
 		@ini_set('iconv.internal_encoding', $charset);
270
-	}
271
-	else
267
+	} else
272 268
 	{
273 269
 		define('ICONV_ENABLED', FALSE);
274 270
 	}
@@ -378,8 +374,7 @@  discard block
 block discarded – undo
378 374
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
379 375
 		{
380 376
 			return CI_Controller::get_instance();
381
-		}
382
-		else
377
+		} else
383 378
 		{
384 379
 			return CI::$APP;
385 380
 		}
@@ -424,21 +419,18 @@  discard block
 block discarded – undo
424 419
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
425 420
 	{
426 421
 		$e404 = TRUE;
427
-	}
428
-	else
422
+	} else
429 423
 	{
430 424
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
431 425
 
432 426
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
433 427
 		{
434 428
 			$e404 = TRUE;
435
-		}
436
-		elseif (method_exists($class, '_remap'))
429
+		} elseif (method_exists($class, '_remap'))
437 430
 		{
438 431
 			$params = array($method, array_slice($URI->rsegments, 2));
439 432
 			$method = '_remap';
440
-		}
441
-		elseif ( ! method_exists($class, $method))
433
+		} elseif ( ! method_exists($class, $method))
442 434
 		{
443 435
 			$e404 = TRUE;
444 436
 		}
@@ -490,8 +482,7 @@  discard block
 block discarded – undo
490 482
 						$RTR->directory = '';
491 483
 					}
492 484
 				}
493
-			}
494
-			else
485
+			} else
495 486
 			{
496 487
 				$e404 = FALSE;
497 488
 			}
@@ -507,8 +498,7 @@  discard block
 block discarded – undo
507 498
 				1 => $class,
508 499
 				2 => $method
509 500
 			);
510
-		}
511
-		else
501
+		} else
512 502
 		{
513 503
 			show_404($RTR->directory.$class.'/'.$method);
514 504
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/helpers/download_helper.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@  discard block
 block discarded – undo
67 67
 		if ($filename === '' OR $data === '')
68 68
 		{
69 69
 			return;
70
-		}
71
-		elseif ($data === NULL)
70
+		} elseif ($data === NULL)
72 71
 		{
73 72
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
74 73
 			{
@@ -78,8 +77,7 @@  discard block
 block discarded – undo
78 77
 			$filepath = $filename;
79 78
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
80 79
 			$filename = end($filename);
81
-		}
82
-		else
80
+		} else
83 81
 		{
84 82
 			$filesize = strlen($data);
85 83
 		}
@@ -158,8 +156,7 @@  discard block
 block discarded – undo
158 156
 			if (ENVIRONMENT !== 'testing')
159 157
 			{
160 158
 				exit($data);
161
-			}
162
-			else
159
+			} else
163 160
 			{
164 161
 				echo($data);
165 162
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -176,8 +173,7 @@  discard block
 block discarded – undo
176 173
 		if (ENVIRONMENT !== 'testing')
177 174
 		{
178 175
 			exit;
179
-		}
180
-		else
176
+		} else
181 177
 		{
182 178
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
183 179
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/CIPHPUnitTestSuperGlobal.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,8 +76,7 @@  discard block
 block discarded – undo
76 76
 		if (is_numeric($value))
77 77
 		{
78 78
 			return $value;
79
-		}
80
-		else
79
+		} else
81 80
 		{
82 81
 			$value_length = strlen($value);
83 82
 			$number = substr($value, 0, $value_length - 1);
@@ -133,8 +132,7 @@  discard block
 block discarded – undo
133 132
 		if (is_string($argv))
134 133
 		{
135 134
 			$path = $argv;
136
-		}
137
-		elseif (is_array($argv))
135
+		} elseif (is_array($argv))
138 136
 		{
139 137
 			// Generate URI path from array of controller, method, arg, ...
140 138
 			$path = implode('/', $argv);
@@ -145,8 +143,7 @@  discard block
 block discarded – undo
145 143
 			$_SERVER['REQUEST_URI'] =
146 144
 				'/' . $path . '?'
147 145
 				. http_build_query($_GET);
148
-		}
149
-		else
146
+		} else
150 147
 		{
151 148
 			$_SERVER['REQUEST_URI'] = '/' . $path;
152 149
 		}
@@ -187,8 +184,7 @@  discard block
 block discarded – undo
187 184
 		)
188 185
 		{
189 186
 			$key = $normalized_name;
190
-		}
191
-		else
187
+		} else
192 188
 		{
193 189
 			$key = 'HTTP_' . $normalized_name;
194 190
 		}
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/core/Loader.php 1 patch
Braces   +17 added lines, -34 removed lines patch added patch discarded remove patch
@@ -192,16 +192,14 @@  discard block
 block discarded – undo
192 192
 		if (empty($library))
193 193
 		{
194 194
 			return $this;
195
-		}
196
-		elseif (is_array($library))
195
+		} elseif (is_array($library))
197 196
 		{
198 197
 			foreach ($library as $key => $value)
199 198
 			{
200 199
 				if (is_int($key))
201 200
 				{
202 201
 					$this->library($value, $params);
203
-				}
204
-				else
202
+				} else
205 203
 				{
206 204
 					$this->library($key, $params, $value);
207 205
 				}
@@ -238,8 +236,7 @@  discard block
 block discarded – undo
238 236
 		if (empty($model))
239 237
 		{
240 238
 			return $this;
241
-		}
242
-		elseif (is_array($model))
239
+		} elseif (is_array($model))
243 240
 		{
244 241
 			foreach ($model as $key => $value)
245 242
 			{
@@ -305,8 +302,7 @@  discard block
 block discarded – undo
305 302
 				{
306 303
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
307 304
 				}
308
-			}
309
-			elseif ( ! class_exists('CI_Model', FALSE))
305
+			} elseif ( ! class_exists('CI_Model', FALSE))
310 306
 			{
311 307
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
312 308
 			}
@@ -457,8 +453,7 @@  discard block
 block discarded – undo
457 453
 				require_once($driver_path);
458 454
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
459 455
 			}
460
-		}
461
-		else
456
+		} else
462 457
 		{
463 458
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
464 459
 		}
@@ -725,16 +720,14 @@  discard block
 block discarded – undo
725 720
 				if (is_int($key))
726 721
 				{
727 722
 					$this->driver($value, $params);
728
-				}
729
-				else
723
+				} else
730 724
 				{
731 725
 					$this->driver($key, $params, $value);
732 726
 				}
733 727
 			}
734 728
 
735 729
 			return $this;
736
-		}
737
-		elseif (empty($library))
730
+		} elseif (empty($library))
738 731
 		{
739 732
 			return FALSE;
740 733
 		}
@@ -827,8 +820,7 @@  discard block
 block discarded – undo
827 820
 			array_shift($this->_ci_helper_paths);
828 821
 			array_shift($this->_ci_view_paths);
829 822
 			array_pop($config->_config_paths);
830
-		}
831
-		else
823
+		} else
832 824
 		{
833 825
 			$path = rtrim($path, '/').'/';
834 826
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -890,8 +882,7 @@  discard block
 block discarded – undo
890 882
 		{
891 883
 			$_ci_x = explode('/', $_ci_path);
892 884
 			$_ci_file = end($_ci_x);
893
-		}
894
-		else
885
+		} else
895 886
 		{
896 887
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
897 888
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -969,8 +960,7 @@  discard block
 block discarded – undo
969 960
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
970 961
 		{
971 962
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
972
-		}
973
-		else
963
+		} else
974 964
 		{
975 965
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
976 966
 		}
@@ -997,8 +987,7 @@  discard block
 block discarded – undo
997 987
 		if (ob_get_level() > $this->_ci_ob_level + 1)
998 988
 		{
999 989
 			ob_end_flush();
1000
-		}
1001
-		else
990
+		} else
1002 991
 		{
1003 992
 			$_ci_CI->output->append_output(ob_get_contents());
1004 993
 			@ob_end_clean();
@@ -1038,8 +1027,7 @@  discard block
 block discarded – undo
1038 1027
 
1039 1028
 			// Get the filename from the path
1040 1029
 			$class = substr($class, $last_slash);
1041
-		}
1042
-		else
1030
+		} else
1043 1031
 		{
1044 1032
 			$subdir = '';
1045 1033
 		}
@@ -1177,8 +1165,7 @@  discard block
 block discarded – undo
1177 1165
 		if (file_exists(APPPATH.'tests/_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php'))
1178 1166
 		{
1179 1167
 			include_once(APPPATH.'tests/_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php');
1180
-		}
1181
-		else
1168
+		} else
1182 1169
 		{
1183 1170
 			include_once(BASEPATH.'libraries/'.$file_path.$library_name.'.php');
1184 1171
 		}
@@ -1194,8 +1181,7 @@  discard block
 block discarded – undo
1194 1181
 				{
1195 1182
 					$prefix = config_item('subclass_prefix');
1196 1183
 					break;
1197
-				}
1198
-				else
1184
+				} else
1199 1185
 				{
1200 1186
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
1201 1187
 				}
@@ -1242,8 +1228,7 @@  discard block
 block discarded – undo
1242 1228
 					{
1243 1229
 						include($path.'config/'.strtolower($class).'.php');
1244 1230
 						$found = TRUE;
1245
-					}
1246
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1231
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
1247 1232
 					{
1248 1233
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
1249 1234
 						$found = TRUE;
@@ -1253,8 +1238,7 @@  discard block
 block discarded – undo
1253 1238
 					{
1254 1239
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
1255 1240
 						$found = TRUE;
1256
-					}
1257
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1241
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
1258 1242
 					{
1259 1243
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
1260 1244
 						$found = TRUE;
@@ -1442,8 +1426,7 @@  discard block
 block discarded – undo
1442 1426
 		if ( ! is_array($filename))
1443 1427
 		{
1444 1428
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
1445
-		}
1446
-		else
1429
+		} else
1447 1430
 		{
1448 1431
 			foreach ($filename as $key => $val)
1449 1432
 			{
Please login to merge, or discard this patch.
application/tests/_ci_phpunit_test/replacing/libraries/Upload.php 1 patch
Braces   +21 added lines, -19 removed lines patch added patch discarded remove patch
@@ -327,19 +327,16 @@  discard block
 block discarded – undo
327 327
 					if ($reflection->hasMethod('set_'.$key))
328 328
 					{
329 329
 						$this->{'set_'.$key}($config[$key]);
330
-					}
331
-					else
330
+					} else
332 331
 					{
333 332
 						$this->$key = $config[$key];
334 333
 					}
335
-				}
336
-				else
334
+				} else
337 335
 				{
338 336
 					$this->$key = $defaults[$key];
339 337
 				}
340 338
 			}
341
-		}
342
-		else
339
+		} else
343 340
 		{
344 341
 			foreach ($config as $key => &$value)
345 342
 			{
@@ -348,8 +345,7 @@  discard block
 block discarded – undo
348 345
 					if ($reflection->hasMethod('set_'.$key))
349 346
 					{
350 347
 						$this->{'set_'.$key}($value);
351
-					}
352
-					else
348
+					} else
353 349
 					{
354 350
 						$this->$key = $value;
355 351
 					}
@@ -409,9 +405,11 @@  discard block
 block discarded – undo
409 405
 		}
410 406
 
411 407
 		// Was the file able to be uploaded? If not, determine the reason why.
412
-		if ( ! file_exists($_file['tmp_name']))	// modified by ci-phpunit-test
408
+		if ( ! file_exists($_file['tmp_name'])) {
409
+			// modified by ci-phpunit-test
413 410
 		{
414 411
 			$error = isset($_file['error']) ? $_file['error'] : 4;
412
+		}
415 413
 
416 414
 			switch ($error)
417 415
 			{
@@ -476,8 +474,7 @@  discard block
 block discarded – undo
476 474
 			if (strpos($this->_file_name_override, '.') === FALSE)
477 475
 			{
478 476
 				$this->file_name .= $this->file_ext;
479
-			}
480
-			else
477
+			} else
481 478
 			{
482 479
 				// An extension was provided, let's have it!
483 480
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
@@ -677,8 +674,7 @@  discard block
 block discarded – undo
677 674
 		{
678 675
 			$this->set_error('upload_bad_filename', 'debug');
679 676
 			return FALSE;
680
-		}
681
-		else
677
+		} else
682 678
 		{
683 679
 			return $new_filename;
684 680
 		}
@@ -863,8 +859,7 @@  discard block
 block discarded – undo
863 859
 		if (in_array($this->file_type, $png_mimes))
864 860
 		{
865 861
 			$this->file_type = 'image/png';
866
-		}
867
-		elseif (in_array($this->file_type, $jpeg_mimes))
862
+		} elseif (in_array($this->file_type, $jpeg_mimes))
868 863
 		{
869 864
 			$this->file_type = 'image/jpeg';
870 865
 		}
@@ -1116,9 +1111,12 @@  discard block
 block discarded – undo
1116 1111
 
1117 1112
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
1118 1113
 		{
1119
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
1114
+			if (($file = @fopen($file, 'rb')) === FALSE) {
1115
+				// "b" to force binary
1120 1116
 			{
1121
-				return FALSE; // Couldn't open the file, return FALSE
1117
+				return FALSE;
1118
+			}
1119
+			// Couldn't open the file, return FALSE
1122 1120
 			}
1123 1121
 
1124 1122
 			$opening_bytes = fread($file, 256);
@@ -1220,9 +1218,11 @@  discard block
 block discarded – undo
1220 1218
 
1221 1219
 		// Fileinfo extension - most reliable method
1222 1220
 		$finfo = @finfo_open(FILEINFO_MIME);
1223
-		if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1221
+		if (is_resource($finfo)) {
1222
+			// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
1224 1223
 		{
1225 1224
 			$mime = @finfo_file($finfo, $file['tmp_name']);
1225
+		}
1226 1226
 			finfo_close($finfo);
1227 1227
 
1228 1228
 			/* According to the comments section of the PHP manual page,
@@ -1306,10 +1306,12 @@  discard block
 block discarded – undo
1306 1306
 		if (function_exists('mime_content_type'))
1307 1307
 		{
1308 1308
 			$this->file_type = @mime_content_type($file['tmp_name']);
1309
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
1309
+			if (strlen($this->file_type) > 0) {
1310
+				// It's possible that mime_content_type() returns FALSE or an empty string
1310 1311
 			{
1311 1312
 				return;
1312 1313
 			}
1314
+			}
1313 1315
 		}
1314 1316
 
1315 1317
 		$this->file_type = $file['type'];
Please login to merge, or discard this patch.