[ci skip] Normalize tabs/spaces
Partial changes from PR #4016
diff --git a/system/core/Input.php b/system/core/Input.php
index b0bbb7b..e1319be 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -682,7 +682,7 @@
/* We strip slashes if magic quotes is on to keep things consistent
NOTE: In PHP 5.4 get_magic_quotes_gpc() will always return 0 and
- it will probably not exist in future versions at all.
+ it will probably not exist in future versions at all.
*/
if ( ! is_php('5.4') && get_magic_quotes_gpc())
{
@@ -844,7 +844,7 @@
* Test to see if a request was made from the command line.
*
* @deprecated 3.0.0 Use is_cli() instead
- * @return bool
+ * @return bool
*/
public function is_cli_request()
{
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 1f48c07..5de7a94 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -514,7 +514,7 @@
*
* Clears the cached variables.
*
- * @return object
+ * @return CI_Loader
*/
public function clear_vars()
{
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index d2bce5c..e58496d 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -451,7 +451,7 @@
*
* This is just a dummy method that all drivers will override.
*
- * @return mixed
+ * @return mixed
*/
public function db_connect()
{
@@ -481,7 +481,7 @@
* This is just a dummy method to allow drivers without such
* functionality to not declare it, while others will override it.
*
- * @return void
+ * @return void
*/
public function reconnect()
{
@@ -495,7 +495,7 @@
* This is just a dummy method to allow drivers without such
* functionality to not declare it, while others will override it.
*
- * @return bool
+ * @return bool
*/
public function db_select()
{
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 3c57777..f2e40da 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -306,12 +306,12 @@
*
* params array keys
*
- * KEY OPTIONAL NOTES
- * name no the name of the parameter should be in :<param_name> format
- * value no the value of the parameter. If this is an OUT or IN OUT parameter,
- * this should be a reference to a variable
- * type yes the type of the parameter
- * length yes the max size of the parameter
+ * KEY OPTIONAL NOTES
+ * name no the name of the parameter should be in :<param_name> format
+ * value no the value of the parameter. If this is an OUT or IN OUT parameter,
+ * this should be a reference to a variable
+ * type yes the type of the parameter
+ * length yes the max size of the parameter
*/
public function stored_procedure($package, $procedure, array $params)
{
diff --git a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
index cf5a0c7..7a767ef 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
@@ -158,7 +158,7 @@
* @param string $table
* @param array $values
* @return string
- */
+ */
protected function _update($table, $values)
{
$this->qb_limit = FALSE;
diff --git a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
index 844ffab..ae2b998 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
@@ -227,7 +227,7 @@
* @param string $table
* @param array $values
* @return string
- */
+ */
protected function _update($table, $values)
{
$this->qb_limit = FALSE;
diff --git a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
index 3bd5c93..0bafde8 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
@@ -211,7 +211,7 @@
*
* @param string $table
* @return string
- */
+ */
protected function _truncate($table)
{
return 'DELETE FROM '.$table;
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index c69283a..e813efd 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -779,7 +779,7 @@
$this->y_axis = 0;
}
- // Create the image handle
+ // Create the image handle
if ( ! ($src_img = $this->image_create_gd()))
{
return FALSE;
@@ -1195,7 +1195,7 @@
$x_axis += $this->orig_width - $wm_width;
}
- // Build the finalized image
+ // Build the finalized image
if ($wm_img_type === 3 && function_exists('imagealphablending'))
{
@imagealphablending($src_img, TRUE);
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 20ddfc1..8a2dec7 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1023,7 +1023,7 @@
if (count($x) === 1)
{
- return '';
+ return '';
}
$ext = ($this->file_ext_tolower) ? strtolower(end($x)) : end($x);