Merge pull request chriskacerguis#644 from softwarespot/fix-paren

chriskacerguis · chriskacerguis · commit dd5a06d34862 · 2016-04-17T18:15:14.000-05:00
Fixed parenthesis
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -557,7 +557,9 @@ public function __construct($config = 'rest')
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && ! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
+        if ($this->auth_override === FALSE &&
+            (! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) ||
+            ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,9 @@ public function __construct($config = 'rest')`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`// When there is no specific override for the current class/method, use the default auth value set in the config`
`560`		`- if ($this->auth_override === FALSE && ! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) \|\| ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))`
	`560`	`+ if ($this->auth_override === FALSE &&`
	`561`	`+ (! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) \|\|`
	`562`	`+ ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))`
`561`	`563`	`{`
`562`	`564`	`$rest_auth = strtolower($this->config->item('rest_auth'));`
`563`	`565`	`switch ($rest_auth)`