aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/user.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-05-12 22:41:00 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-05-12 22:41:00 +0200
commit7e70eec5a37ddfe112e12b976821c5b944128d32 (patch)
treebc5c4b8d279474dc78207f72d65915d2b4ff1064 /phpBB/includes/user.php
parentf90ed6c3cb9e1b8baeb352a07b81608fa7c067b5 (diff)
parentfe13b89dd4bd6d808d81c903e66fe869ccd43050 (diff)
downloadforums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar.gz
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar.bz2
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.tar.xz
forums-7e70eec5a37ddfe112e12b976821c5b944128d32.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465
Diffstat (limited to 'phpBB/includes/user.php')
-rw-r--r--phpBB/includes/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index 9ddd806b27..5530fe3f03 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -215,7 +215,7 @@ class phpbb_user extends phpbb_session
if (!$this->style)
{
- trigger_error('Could not get style data', E_USER_ERROR);
+ trigger_error('NO_STYLE_DATA', E_USER_ERROR);
}
// Now parse the cfg file and cache it