diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-03-31 18:16:55 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-03-31 18:16:55 +0200 |
| commit | 7e2f16aafa47f8db51a12a293b0616cb75b4d12f (patch) | |
| tree | 3e5e62baab0038d4895eaa9c7a47dadbc3eb4e84 /phpBB/includes/acp/auth.php | |
| parent | 17a7b570747a91321903e30f3c0dd6f8246c0047 (diff) | |
| parent | 9236dd4c471a6f7655bd00ae422a13013a400ac4 (diff) | |
| download | forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar.gz forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar.bz2 forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar.xz forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.zip | |
Merge remote-tracking branch 'github-igorw/feature/class-prefix' into develop
* github-igorw/feature/class-prefix:
[feature/class-prefix] Rename auth => phpbb_auth
[feature/class-prefix] Rename user and session to phpbb_*
Diffstat (limited to 'phpBB/includes/acp/auth.php')
| -rw-r--r-- | phpBB/includes/acp/auth.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 8f99450776..7d9fd267ff 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * ACP Permission/Auth class * @package phpBB3 */ -class auth_admin extends auth +class auth_admin extends phpbb_auth { /** * Init auth settings @@ -130,7 +130,7 @@ class auth_admin extends auth { if ($user->data['user_id'] != $userdata['user_id']) { - $auth2 = new auth(); + $auth2 = new phpbb_auth(); $auth2->acl($userdata); } else |