diff --git a/phpBB/faq.php b/phpBB/faq.php index 48d40b6dd3..d51f78d5af 100644 --- a/phpBB/faq.php +++ b/phpBB/faq.php @@ -89,13 +89,13 @@ for ($i = 0, $size = sizeof($help_block); $i < $size; $i++) 'FAQ_QUESTION' => $help_block[$i][$j]['question'], 'FAQ_ANSWER' => $help_block[$i][$j]['answer'], - 'U_FAQ_ID' => $help_block[$i][$j]['id']) + 'U_FAQ_ID' => 'f'.$help_block[$i][$j]['id']) ); $template->assign_block_vars('faq_block_link.faq_row_link', array( 'FAQ_LINK' => $help_block[$i][$j]['question'], - 'U_FAQ_LINK' => '#' . $help_block[$i][$j]['id']) + 'U_FAQ_LINK' => '#f' . $help_block[$i][$j]['id']) ); } } diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 6c66d78826..8f843052d5 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -74,6 +74,7 @@ $lang = array_merge($lang, array( 'AVATAR_WRONG_SIZE' => 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.', 'BACK_TO_TOP' => 'Top', + 'BBCODE_GUIDE' => 'BBCode Guide', 'BCC' => 'Bcc', 'BIRTHDAYS' => 'Birthdays', 'BOARD_BAN_PERM' => 'You have been permanently banned from this board.

Please contact the %2$sBoard Administrator%3$s for more information.', diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index d09a8e0f51..33cffd221d 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -42,11 +42,11 @@ $help = array( ), array( 0 => 'How to change the text colour or size', - 1 => 'To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: ' + 1 => 'To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: ' ), array( 0 => 'Can I combine formatting tags?', - 1 => 'Yes, of course you can, for example to get someones attention you may write:

[size=18][color=red][b]LOOK AT ME![/b][/color][/size]

this would output LOOK AT ME!

We don\'t recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:

[b][u]This is wrong[/b][/u]' + 1 => 'Yes, of course you can, for example to get someones attention you may write:

[size=18][color=red][b]LOOK AT ME![/b][/color][/size]

this would output LOOK AT ME!

We don\'t recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect:

[b][u]This is wrong[/b][/u]' ), array( 0 => '--', @@ -54,11 +54,11 @@ $help = array( ), array( 0 => 'Quoting text in replies', - 1 => 'There are two ways you can quote text, with a reference or without.' + 1 => 'There are two ways you can quote text, with a reference or without.' ), array( 0 => 'Outputting code or fixed width data', - 1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font you should enclose the text in [code][/code] tags, eg.

[code]echo \"This is some code\";[/code]

All formatting used within [code][/code] tags is retained when you later view it.' + 1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font you should enclose the text in [code][/code] tags, eg.

[code]echo "This is some code";[/code]

All formatting used within [code][/code] tags is retained when you later view it.' ), array( 0 => '--', @@ -70,7 +70,7 @@ $help = array( ), array( 0 => 'Creating an Ordered list', - 1 => 'The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use [list=1][/list] to create a numbered list or alternatively [list=a][/list] for an alphabetical list. As with the unordered list items are specified using [*]. For example:

[list=1]
[*]Go to the shops
[*]Buy a new computer
[*]Swear at computer when it crashes
[/list]

will generate the following:
  1. Go to the shops
  2. Buy a new computer
  3. Swear at computer when it crashes
Whereas for an alphabetical list you would use:

[list=a]
[*]The first possible answer
[*]The second possible answer
[*]The third possible answer
[/list]

giving
  1. The first possible answer
  2. The second possible answer
  3. The third possible answer
' + 1 => 'The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use [list=1][/list] to create a numbered list or alternatively [list=a][/list] for an alphabetical list. As with the unordered list items are specified using [*]. For example:

[list=1]
[*]Go to the shops
[*]Buy a new computer
[*]Swear at computer when it crashes
[/list]

will generate the following:
  1. Go to the shops
  2. Buy a new computer
  3. Swear at computer when it crashes
Whereas for an alphabetical list you would use:

[list=a]
[*]The first possible answer
[*]The second possible answer
[*]The third possible answer
[/list]

giving
  1. The first possible answer
  2. The second possible answer
  3. The third possible answer
' ), array( 0 => '--', @@ -78,7 +78,7 @@ $help = array( ), array( 0 => 'Linking to another site', - 1 => 'phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs.As with all the BBCode tags you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:

[url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/url][/img]

is not correct which may lead to your post being deleted so take care.' + 1 => 'phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs.As with all the BBCode tags you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:

[url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/url][/img]

is not correct which may lead to your post being deleted so take care.' ), array( 0 => '--', @@ -86,7 +86,7 @@ $help = array( ), array( 0 => 'Adding an image to a post', - 1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are; many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). There is currently no way of storing images locally with phpBB (all these issues are expected to be addressed in the next release of phpBB). To display an image you must surround the URL pointing to the image with [img][/img] tags. For example:

[img]http://www.phpbb.com/images/phplogo.gif[/img]

As noted in the URL section above you can wrap an image in a [url][/url] tag if you wish, eg.

[url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/img][/url]

would generate:

\"\"
' + 1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are; many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). There is currently no way of storing images locally with phpBB (all these issues are expected to be addressed in the next release of phpBB). To display an image you must surround the URL pointing to the image with [img][/img] tags. For example:

[img]http://www.phpbb.com/images/phplogo.gif[/img]

As noted in the URL section above you can wrap an image in a [url][/url] tag if you wish, eg.

[url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/img][/url]

would generate:


' ), array( 0 => '--', diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 73d976f3b1..8d501e1acb 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -60,7 +60,7 @@ switch ($mode) } $module->load('ucp', 'register'); - $module->display($user->lang['UCP_REGISTER']); + $module->display($user->lang['REGISTER']); break; case 'confirm':