diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-01 13:47:42 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-01 13:47:42 +0000 |
| commit | 721a9dd4a146a08f26866196d8a347c7aad57274 (patch) | |
| tree | 181f0955fd519718bc30274d226e4ddd108a7242 /phpBB/includes/functions.php | |
| parent | 4354cda6dc695806dc01fdad1e4d11b2749ee9d4 (diff) | |
| download | forums-721a9dd4a146a08f26866196d8a347c7aad57274.tar forums-721a9dd4a146a08f26866196d8a347c7aad57274.tar.gz forums-721a9dd4a146a08f26866196d8a347c7aad57274.tar.bz2 forums-721a9dd4a146a08f26866196d8a347c7aad57274.tar.xz forums-721a9dd4a146a08f26866196d8a347c7aad57274.zip | |
- create forums by default
- hide prune options if not enabled
- fixed module management enable/disable switch if in module itself
- fixed some schema errors
- adjusted $user->page array generation for developers calling scripts outside of phpBB root
git-svn-id: file:///svn/phpbb/trunk@5995 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 525c215845..c90975853a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1435,6 +1435,12 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa // Username, password, etc... default: $err = $user->lang[$result['error_msg']]; + + // Assign admin contact to some error messages + if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD') + { + $err = (!$config['board_contact']) ? sprintf($user->lang[$result['error_msg']], '', '') : sprintf($user->lang[$result['error_msg']], '<a href="mailto:' . htmlentities($config['board_contact']) . '">', '</a>'); + } break; } } |