aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-12-06 22:13:11 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-12-06 22:13:11 +0000
commitb508c57b8046f7372b37e45fd993471303fcfc58 (patch)
tree20e1fe5cccadb28c594334c1585b516621180955 /phpBB/includes/db
parenta9b2e99974398b6e88dc5a1417c0a711ec3a437c (diff)
downloadforums-b508c57b8046f7372b37e45fd993471303fcfc58.tar
forums-b508c57b8046f7372b37e45fd993471303fcfc58.tar.gz
forums-b508c57b8046f7372b37e45fd993471303fcfc58.tar.bz2
forums-b508c57b8046f7372b37e45fd993471303fcfc58.tar.xz
forums-b508c57b8046f7372b37e45fd993471303fcfc58.zip
minor bugfixing
git-svn-id: file:///svn/phpbb/trunk@6719 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/dbal.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index da5efcf55a..f4cbe0e2d4 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -438,7 +438,7 @@ class dbal
*/
function sql_error($sql = '')
{
- global $auth, $user;
+ global $auth, $user, $config;
// Set var to retrieve errored status
$this->sql_error_triggered = true;
@@ -472,7 +472,14 @@ class dbal
}
else
{
- $message .= '<br /><br />' . $user->lang['SQL_ERROR_OCCURRED'];
+ if (!empty($config['board_contact']))
+ {
+ $message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+ }
+ else
+ {
+ $message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
+ }
}
}