fixes 326

Chris Kacerguis · Chris Kacerguis · commit 1ce33e003682 · 2014-06-24T08:06:00.000-05:00
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -299,7 +299,7 @@ public function __construct()
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override !== true && $this->_allow === false) {
+        if ($this->auth_override !== true && !(config_item('rest_enable_keys') && $this->_allow === true)) {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth) {
                 case 'basic':

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public function __construct()`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`// When there is no specific override for the current class/method, use the default auth value set in the config`
`302`		`- if ($this->auth_override !== true && $this->_allow === false) {`
	`302`	`+ if ($this->auth_override !== true && !(config_item('rest_enable_keys') && $this->_allow === true)) {`
`303`	`303`	`$rest_auth = strtolower($this->config->item('rest_auth'));`
`304`	`304`	`switch ($rest_auth) {`
`305`	`305`	`case 'basic':`