Merge pull request chriskacerguis#173 from jrmadsen67/master

Phil Sturgeon · Phil Sturgeon · commit cb66c01c953c · 2013-01-09T19:48:20.000-08:00
two typos from ldap commit
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -114,7 +114,7 @@ abstract class REST_Controller extends CI_Controller
 	 *
 	 * @var string
 	*/
-	protected $_user_ldap_dn = ''
+	protected $_user_ldap_dn = '';
 
 	/**
 	 * List all supported methods, the first will be the default format
@@ -1072,7 +1072,7 @@ protected function _check_login($username = '', $password = NULL)
 			return FALSE;
 		}
 
-		$auth_source = strtolower($this-config->item('auth_source'));
+		$auth_source = strtolower($this->config->item('auth_source'));
 
 		if ($auth_source == 'ldap')
 		{

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ abstract class REST_Controller extends CI_Controller`
`114`	`114`	`*`
`115`	`115`	`* @var string`
`116`	`116`	`*/`
`117`		`- protected $_user_ldap_dn = ''`
	`117`	`+ protected $_user_ldap_dn = '';`
`118`	`118`
`119`	`119`	`/**`
`120`	`120`	`* List all supported methods, the first will be the default format`
`@@ -1072,7 +1072,7 @@ protected function _check_login($username = '', $password = NULL)`
`1072`	`1072`	`return FALSE;`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`		`- $auth_source = strtolower($this-config->item('auth_source'));`
	`1075`	`+ $auth_source = strtolower($this->config->item('auth_source'));`
`1076`	`1076`
`1077`	`1077`	`if ($auth_source == 'ldap')`
`1078`	`1078`	`{`