Merge pull request chriskacerguis#316 from andreustimm/master

Check to include calls to models

Author: chriskacerguis

application/libraries/REST_Controller.php

@@ -250,13 +250,13 @@ public function __construct()
         }
 
         // Merge both for one mega-args variable
-        $this->_args = array_merge($this->_get_args, 
-            $this->_options_args, 
-            $this->_patch_args, 
-            $this->_head_args , 
-            $this->_put_args, 
-            $this->_post_args, 
-            $this->_delete_args, 
+        $this->_args = array_merge($this->_get_args,
+            $this->_options_args,
+            $this->_patch_args,
+            $this->_head_args ,
+            $this->_put_args,
+            $this->_post_args,
+            $this->_delete_args,
             $this->{'_'.$this->request->method.'_args'}
         );
 
@@ -510,7 +510,7 @@ public function response($data = null, $http_code = null, $continue = false)
             echo($output);
             ob_end_flush();
             ob_flush();
-            flush();  
+            flush();
         }else{
             exit($output);
         }
@@ -1242,7 +1242,11 @@ protected function _perform_library_auth($username = '', $password = null)
             return false;
         }
 
-        $this->load->library($auth_library_class);
+        if (!is_callable(array($this->$auth_library_class, $auth_library_function))) {
+
+            $this->load->library($auth_library_class);
+
+        }
 
         return $this->$auth_library_class->$auth_library_function($username, $password);
     }