Merge pull request chriskacerguis#427 from Tjoosten/master

correct else if

Author: chriskacerguis

application/libraries/Format.php

@@ -153,7 +153,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
 				}
 			}
 			// if there is another array found recursively call this function
-			else if (is_array($value) || is_object($value))
+			elseif (is_array($value) || is_object($value))
 			{
 				$node = $structure->addChild($key);
 
@@ -266,7 +266,7 @@ public function to_json()
 		}
 
 		// we only honour jsonp callback which are valid javascript identifiers
-		else if (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
+		elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
 		{
 			// this is a jsonp request, the content-type must be updated to be text/javascript
 			header("Content-Type: application/javascript");

application/libraries/REST_Controller.php

@@ -415,7 +415,7 @@ public function _remap($object_called, $arguments)
         }
 
         // No key stuff, but record that stuff is happening
-        else if (config_item('rest_enable_logging') and $log_method) {
+        elseif (config_item('rest_enable_logging') and $log_method) {
             $this->_log_request($authorized = TRUE);
         }
 
@@ -459,7 +459,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         }
 
         // If data is NULL but http code provided, keep the output empty
-        else if ($data === NULL && is_numeric($http_code)) {
+        elseif ($data === NULL && is_numeric($http_code)) {
             $output = NULL;
         }
 
@@ -825,7 +825,7 @@ protected function _check_limit($controller_method)
         }
 
         // Been an hour since they called
-        else if ($result->hour_started < time() - (60 * 60)) {
+        elseif ($result->hour_started < time() - (60 * 60)) {
             // Reset the started period
             $this->rest->db
                     ->where('uri', $this->uri->uri_string())