Changed calling input->server() function twice

softwarespot · softwarespot · commit fd8bf1cbc4fb · 2015-07-22T00:01:07.000+03:00
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -1904,12 +1904,8 @@ protected function _prepare_digest_auth()
 
         // We need to test which server authentication variable to use,
         // because the PHP ISAPI module in IIS acts different from CGI
-        $digest_string = '';
-        if ($this->input->server('PHP_AUTH_DIGEST'))
-        {
-            $digest_string = $this->input->server('PHP_AUTH_DIGEST');
-        }
-        elseif ($this->input->server('HTTP_AUTHORIZATION'))
+        $digest_string = $this->input->server('PHP_AUTH_DIGEST');
+        if ($digest_string === NULL)
         {
             $digest_string = $this->input->server('HTTP_AUTHORIZATION');
         }

Original file line number	Diff line number	Diff line change
`@@ -1904,12 +1904,8 @@ protected function _prepare_digest_auth()`
`1904`	`1904`
`1905`	`1905`	`// We need to test which server authentication variable to use,`
`1906`	`1906`	`// because the PHP ISAPI module in IIS acts different from CGI`
`1907`		`- $digest_string = '';`
`1908`		`- if ($this->input->server('PHP_AUTH_DIGEST'))`
`1909`		`- {`
`1910`		`- $digest_string = $this->input->server('PHP_AUTH_DIGEST');`
`1911`		`- }`
`1912`		`- elseif ($this->input->server('HTTP_AUTHORIZATION'))`
	`1907`	`+ $digest_string = $this->input->server('PHP_AUTH_DIGEST');`
	`1908`	`+ if ($digest_string === NULL)`
`1913`	`1909`	`{`
`1914`	`1910`	`$digest_string = $this->input->server('HTTP_AUTHORIZATION');`
`1915`	`1911`	`}`