mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9975] Translate missing style error message

Conflicts:
	phpBB/includes/session.php
This commit is contained in:
Nils Adermann
2013-04-24 19:13:47 +02:00
parent aaf109e07d a33cc92fc8
commit b3497d955f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/user.php
View File

@@ -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