diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-12 23:17:30 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-12 23:17:30 +0000 |
| commit | e4defede57bcde636ee7afb59e0e9a385f7f4a13 (patch) | |
| tree | 0ca637e6d650147cd257f35062ea3c47c7be2326 /phpBB/language/en/mcp.php | |
| parent | c12fd5d434c9a3cda6bedb2d450243b278cd5dcb (diff) | |
| download | forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.gz forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.bz2 forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.xz forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.zip | |
- forum administration (now working and modified for easier handling the different forum types [UI])
- Changed += for arrays into array_merge. We do not want to append, we want to merge. ;)
git-svn-id: file:///svn/phpbb/trunk@5330 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/mcp.php')
| -rw-r--r-- | phpBB/language/en/mcp.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index eaabe40211..8abdb0b915 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -3,7 +3,7 @@ * * mcp [English] * -* @package phpBB3 +* @package language * @version $Id$ * @copyright (c) 2005 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License @@ -28,7 +28,7 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -$lang += array( +$lang = array_merge($lang, array( 'ACTION' => 'Action', 'ADD_FEEDBACK' => 'Add feedback', 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.', @@ -287,7 +287,7 @@ $lang += array( 'OFF_TOPIC' => 'The reported post is off topic', 'OTHER' => 'The reported post does not fit into any other category, please use the description field' ) - ) -); + ), +)); ?>
\ No newline at end of file |