From 9e1f7421f543e098bf893438a2b6d1f9d6e9d849 Mon Sep 17 00:00:00 2001 From: Kirk Mayo Date: Wed, 18 Jul 2012 17:02:31 +1200 Subject: [PATCH] BUG: open ticket 7678 fixing usable_tags to send an array to ArrayList --- parsers/BBCodeParser.php | 120 ++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/parsers/BBCodeParser.php b/parsers/BBCodeParser.php index e2fec6e9d7f..c9618218ee3 100644 --- a/parsers/BBCodeParser.php +++ b/parsers/BBCodeParser.php @@ -64,65 +64,67 @@ static function enable_smilies() { static function usable_tags() { return new ArrayList( - new ArrayData(array( - "Title" => _t('BBCodeParser.BOLD', 'Bold Text'), - "Example" => '[b]'._t('BBCodeParser.BOLDEXAMPLE', 'Bold').'[/b]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.ITALIC', 'Italic Text'), - "Example" => '[i]'._t('BBCodeParser.ITALICEXAMPLE', 'Italics').'[/i]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.UNDERLINE', 'Underlined Text'), - "Example" => '[u]'._t('BBCodeParser.UNDERLINEEXAMPLE', 'Underlined').'[/u]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.STRUCK', 'Struck-out Text'), - "Example" => '[s]'._t('BBCodeParser.STRUCKEXAMPLE', 'Struck-out').'[/s]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.COLORED', 'Colored text'), - "Example" => '[color=blue]'._t('BBCodeParser.COLOREDEXAMPLE', 'blue text').'[/color]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.ALIGNEMENT', 'Alignment'), - "Example" => '[align=right]'._t('BBCodeParser.ALIGNEMENTEXAMPLE', 'right aligned').'[/align]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.CODE', 'Code Block'), - "Description" => _t('BBCodeParser.CODEDESCRIPTION', 'Unformatted code block'), - "Example" => '[code]'._t('BBCodeParser.CODEEXAMPLE', 'Code block').'[/code]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.EMAILLINK', 'Email link'), - "Description" => _t('BBCodeParser.EMAILLINKDESCRIPTION', 'Create link to an email address'), - "Example" => "[email]you@yoursite.com[/email]" - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.EMAILLINK', 'Email link'), - "Description" => _t('BBCodeParser.EMAILLINKDESCRIPTION', 'Create link to an email address'), - "Example" => "[email=you@yoursite.com]Email[/email]" - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.UNORDERED', 'Unordered list'), - "Description" => _t('BBCodeParser.UNORDEREDDESCRIPTION', 'Unordered list'), - "Example" => '[ulist][*]'._t('BBCodeParser.UNORDEREDEXAMPLE1', 'unordered item 1').'[/ulist]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.IMAGE', 'Image'), - "Description" => _t('BBCodeParser.IMAGEDESCRIPTION', 'Show an image in your post'), - "Example" => "[img]http://www.website.com/image.jpg[/img]" - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.LINK', 'Website link'), - "Description" => _t('BBCodeParser.LINKDESCRIPTION', 'Link to another website or URL'), - "Example" => '[url]http://www.website.com/[/url]' - )), - new ArrayData(array( - "Title" => _t('BBCodeParser.LINK', 'Website link'), - "Description" => _t('BBCodeParser.LINKDESCRIPTION', 'Link to another website or URL'), - "Example" => "[url=http://www.website.com/]Website[/url]" - )) + array( + new ArrayData(array( + "Title" => _t('BBCodeParser.BOLD', 'Bold Text'), + "Example" => '[b]'._t('BBCodeParser.BOLDEXAMPLE', 'Bold').'[/b]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.ITALIC', 'Italic Text'), + "Example" => '[i]'._t('BBCodeParser.ITALICEXAMPLE', 'Italics').'[/i]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.UNDERLINE', 'Underlined Text'), + "Example" => '[u]'._t('BBCodeParser.UNDERLINEEXAMPLE', 'Underlined').'[/u]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.STRUCK', 'Struck-out Text'), + "Example" => '[s]'._t('BBCodeParser.STRUCKEXAMPLE', 'Struck-out').'[/s]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.COLORED', 'Colored text'), + "Example" => '[color=blue]'._t('BBCodeParser.COLOREDEXAMPLE', 'blue text').'[/color]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.ALIGNEMENT', 'Alignment'), + "Example" => '[align=right]'._t('BBCodeParser.ALIGNEMENTEXAMPLE', 'right aligned').'[/align]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.CODE', 'Code Block'), + "Description" => _t('BBCodeParser.CODEDESCRIPTION', 'Unformatted code block'), + "Example" => '[code]'._t('BBCodeParser.CODEEXAMPLE', 'Code block').'[/code]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.EMAILLINK', 'Email link'), + "Description" => _t('BBCodeParser.EMAILLINKDESCRIPTION', 'Create link to an email address'), + "Example" => "[email]you@yoursite.com[/email]" + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.EMAILLINK', 'Email link'), + "Description" => _t('BBCodeParser.EMAILLINKDESCRIPTION', 'Create link to an email address'), + "Example" => "[email=you@yoursite.com]Email[/email]" + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.UNORDERED', 'Unordered list'), + "Description" => _t('BBCodeParser.UNORDEREDDESCRIPTION', 'Unordered list'), + "Example" => '[ulist][*]'._t('BBCodeParser.UNORDEREDEXAMPLE1', 'unordered item 1').'[/ulist]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.IMAGE', 'Image'), + "Description" => _t('BBCodeParser.IMAGEDESCRIPTION', 'Show an image in your post'), + "Example" => "[img]http://www.website.com/image.jpg[/img]" + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.LINK', 'Website link'), + "Description" => _t('BBCodeParser.LINKDESCRIPTION', 'Link to another website or URL'), + "Example" => '[url]http://www.website.com/[/url]' + )), + new ArrayData(array( + "Title" => _t('BBCodeParser.LINK', 'Website link'), + "Description" => _t('BBCodeParser.LINKDESCRIPTION', 'Link to another website or URL'), + "Example" => "[url=http://www.website.com/]Website[/url]" + )) + ) ); }