diff options
| author | Matt Friedman <maf675@gmail.com> | 2013-12-12 10:28:10 -0800 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2013-12-12 10:28:10 -0800 |
| commit | a59bbeed2dd82b316f1e2f9ad484b978ef2a541c (patch) | |
| tree | f3d667b7711b44fa56f6d575b8ae2bc072682d23 /phpBB/phpbb/auth/provider/ldap.php | |
| parent | 2ae6f216f66466a1851f52cbc9839e3405525981 (diff) | |
| parent | da6ced59d9632fec5103ce4bea86eb6bcceb5d1e (diff) | |
| download | forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.gz forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.bz2 forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.xz forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.zip | |
[ticket/11966] Merge branch 'develop' into ticket/11966
PHPBB3-11966
Diffstat (limited to 'phpBB/phpbb/auth/provider/ldap.php')
| -rw-r--r-- | phpBB/phpbb/auth/provider/ldap.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php index 9d29789567..4ce43853bd 100644 --- a/phpBB/phpbb/auth/provider/ldap.php +++ b/phpBB/phpbb/auth/provider/ldap.php @@ -10,14 +10,6 @@ namespace phpbb\auth\provider; /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** * Database authentication provider for phpBB3 * * This is for authentication via the integrated user table @@ -97,7 +89,6 @@ class ldap extends \phpbb\auth\provider\base @ldap_close($ldap); - if (!is_array($result) || sizeof($result) < 2) { return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']); |