diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:13:47 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-04-24 19:13:47 +0200 |
| commit | b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd (patch) | |
| tree | ed007c3506c30382f2fafe511c755138679ab15f | |
| parent | aaf109e07d6847fd45c6c3ce0a72399aa21ff5cb (diff) | |
| parent | a33cc92fc8890ccb5910c32d09a66420e7f71215 (diff) | |
| download | forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar.gz forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar.bz2 forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.tar.xz forums-b3497d955f328bb8ddd103d7162a8b2f6c0bc5fd.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9975] Translate missing style error message
Conflicts:
phpBB/includes/session.php
| -rw-r--r-- | phpBB/includes/user.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
2 files changed, 2 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 diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5d6fe03b5f..ebf121bf90 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -454,6 +454,7 @@ $lang = array_merge($lang, array( 'NO_POSTS_TIME_FRAME' => 'No posts exist inside this topic for the selected time frame.', 'NO_FEED_ENABLED' => 'Feeds are not available on this board.', 'NO_FEED' => 'The requested feed is not available.', + 'NO_STYLE_DATA' => 'Could not get style data', 'NO_SUBJECT' => 'No subject specified', // Used for posts having no subject defined but displayed within management pages. 'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist.', 'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods.', |