Merge pull request chriskacerguis#561 from softwarespot/minor-tweaks

Minor tweaks
sase-zz · Sep 18, 2015 · 186f52e · 186f52e
2 parents b6e3e63 + bc8abe8
commit 186f52e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/application/language/english/rest_controller_lang.php b/application/language/english/rest_controller_lang.php
@@ -1,8 +1,8 @@
 <?php
 
 /*
-* English language
-*/
+ * English language
+ */
 
 $lang['text_rest_invalid_api_key'] = 'Invalid API key %s'; // %s is the REST API key
 $lang['text_rest_invalid_credentials'] = 'Invalid credentials';

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -212,13 +212,6 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_post_args = [];
 
-    /**
-     * The insert_id of the log entry (if we have one)
-     *
-     * @var string
-     */
-    protected $_insert_id = '';
-
     /**
      * The arguments for the PUT request method
      *
@@ -268,6 +261,13 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_args = [];
 
+    /**
+     * The insert_id of the log entry (if we have one)
+     *
+     * @var string
+     */
+    protected $_insert_id = '';
+
     /**
      * If the request is allowed based on the API key provided
      *