diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-09 10:43:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-09 10:43:02 +0100 |
| commit | e603451b2fbe0a829358809b4baed97d0013a223 (patch) | |
| tree | fe1da2fd6c798b8748e90a9d7defbb19a4f53058 /phpBB/phpbb | |
| parent | b8636ab961a195ab451942865b11c96856436e91 (diff) | |
| parent | 10b628a20a6549452c117a8733629d8bdc909faf (diff) | |
| download | forums-e603451b2fbe0a829358809b4baed97d0013a223.tar forums-e603451b2fbe0a829358809b4baed97d0013a223.tar.gz forums-e603451b2fbe0a829358809b4baed97d0013a223.tar.bz2 forums-e603451b2fbe0a829358809b4baed97d0013a223.tar.xz forums-e603451b2fbe0a829358809b4baed97d0013a223.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/auth/provider/apache.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php index 9137a77210..aa5bf64335 100644 --- a/phpBB/phpbb/auth/provider/apache.php +++ b/phpBB/phpbb/auth/provider/apache.php @@ -137,7 +137,7 @@ class apache extends \phpbb\auth\provider\base return array( 'status' => LOGIN_SUCCESS_CREATE_PROFILE, 'error_msg' => false, - 'user_row' => user_row_apache($php_auth_user, $php_auth_pw), + 'user_row' => $this->user_row($php_auth_user, $php_auth_pw), ); } @@ -185,7 +185,7 @@ class apache extends \phpbb\auth\provider\base } // create the user if he does not exist yet - user_add(user_row_apache($php_auth_user, $php_auth_pw)); + user_add($this->user_row($php_auth_user, $php_auth_pw)); $sql = 'SELECT * FROM ' . USERS_TABLE . " |