diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-05-21 19:11:04 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-05-21 19:11:04 +0000 |
| commit | fd7b3a095342d1615171be9cb6ad8ffdb750f66c (patch) | |
| tree | 63f4ed63c80079b665cff4748ff3592e4f4a898f /phpBB | |
| parent | 394b2d160a33d8545592cc3ec776a39f5876051b (diff) | |
| download | forums-fd7b3a095342d1615171be9cb6ad8ffdb750f66c.tar forums-fd7b3a095342d1615171be9cb6ad8ffdb750f66c.tar.gz forums-fd7b3a095342d1615171be9cb6ad8ffdb750f66c.tar.bz2 forums-fd7b3a095342d1615171be9cb6ad8ffdb750f66c.tar.xz forums-fd7b3a095342d1615171be9cb6ad8ffdb750f66c.zip | |
Added max_quote_depth limiter to prevent users from nesting a hell lot of quotes.
array_merge() replaced with a faster solution. Note that it will _not_ overwrite existing strings.
git-svn-id: file:///svn/phpbb/trunk@4042 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/lang_main.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index 1f63eb7424..03d95b0e6a 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -521,6 +521,8 @@ $lang = array( 'TOO_FEW_CHARS' => 'Your message contains too few characters', 'TOO_MANY_CHARS' => 'Your message contains too many characters', 'TOO_MANY_SMILIES' => 'Your message contains too many emoticons', + 'UNAUTHORISED_BBCODE' => 'Your are not authorised to use this bbcode: ', + 'QUOTE_DEPTH_EXCEEDED' => 'Quote depth exceeded', 'Forum_locked' => 'This forum is locked you cannot post, reply to or edit topics', 'Topic_locked' => 'This topic is locked you cannot edit posts or make replies', @@ -1082,7 +1084,7 @@ $lang = array( // lang_mod strings -$lang = array_merge($lang, array( +$lang += array( 'FRONT_PAGE' => 'Front page', 'REPORTED_POSTS' => 'Reported posts', 'VIEW_FORUM' => 'View forum', @@ -1270,5 +1272,5 @@ $lang = array_merge($lang, array( 'OTHER' => 'The reported post does not fit into any other category, please use the description field' ) ) -)); +); ?>
\ No newline at end of file |