diff options
| -rw-r--r-- | modules/comment/views/comments.html.php | 2 | ||||
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 11 | ||||
| -rw-r--r-- | modules/organize/js/organize.js | 16 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 1 |
4 files changed, 16 insertions, 14 deletions
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php index 2d754791..fa25a4e0 100644 --- a/modules/comment/views/comments.html.php +++ b/modules/comment/views/comments.html.php @@ -21,7 +21,7 @@ "name" => p::clean($comment->author_name()))); ?> </p> <div> - <?= p::purify($comment->text) ?> + <?= nl2br(p::purify($comment->text)) ?> </div> </li> <? endforeach ?> diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 91fcbe8e..2e40eb7f 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -756,16 +756,17 @@ class g2_import_Core { } static $bbcode_mappings = array( - "#\\[b\\](.*?)\\[/b\\]#" => "<span style=\"font-weight: bold;\">$1</span>", - "#\\[i\\](.*?)\\[/i\\]#" => "<span style=\"font-style: italic;\">$1</span>", - "#\\[u\\](.*?)\\[/u\\]#" => "<span style=\"text-decoration: underline: bold;\">$1</span>", - "#\\[s\\](.*?)\\[/s\\]#" => "<span style=\"font-decoration: line-through;\">$1</span>", + "#\\[b\\](.*?)\\[/b\\]#" => "<b>$1</b>", + "#\\[i\\](.*?)\\[/i\\]#" => "<i>$1</i>", + "#\\[u\\](.*?)\\[/u\\]#" => "<u>$1</u>", + "#\\[s\\](.*?)\\[/s\\]#" => "<s>$1</s>", "#\\[url\\](.*?)\[/url\\]#" => "<a href=\"$1\">$1</a>", "#\\[url=(.*?)\\](.*?)\[/url\\]#" => "<a href=\"$1\">$2</a>", "#\\[img\\](.*?)\\[/img\\]#" => "<img src=\"$1\"/>", "#\\[quote\\](.*?)\\[/quote\\]#" => "<blockquote><p>$1</p></blockquote>", "#\\[code\\](.*?)\\[/code\\]#" => "<pre>$1</pre>", - "#\\[color=([^\\[]*)\\]([^\\[]*)\\[/color\\]#" => "<span style=\"font-color: $1;\">$2/span>", + "#\\[size=([^\\[]*)\\]([^\\[]*)\\[/size\\]#" => "<font size=\"$1\">$2</font>", + "#\\[color=([^\\[]*)\\]([^\\[]*)\\[/color\\]#" => "<font color=\"$1\">$2/font>", "#\\[ul\\](.*?)\\/ul\\]#" => "<ul>$1</ul>", "#\\[li\\](.*?)\\[/li\\]#" => "<li>$1</li>", ); diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 073b4216..f10cbcc9 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -99,7 +99,7 @@ var thumbDroppable = { dataType: "json", success: operationCallback, type: "POST", - url: get_url("organize/startTask/rearrange", {item_id: item_id}) + url: get_organize_url("organize/startTask/rearrange", {item_id: item_id}) }); } }; @@ -135,7 +135,7 @@ var treeDroppable = { dataType: "json", success: operationCallback, type: "POST", - url: get_url("organize/startTask/move", {item_id: targetItemId}) + url: get_organize_url("organize/startTask/move", {item_id: targetItemId}) }); return true; } @@ -274,7 +274,7 @@ function drawerHandleButtonsClick(event) { dataType: "json", success: operationCallback, type: "POST", - url: get_url("organize/startTask/" + operation, {item_id: item_id}) + url: get_organize_url("organize/startTask/" + operation, {item_id: item_id}) }); break; } @@ -331,7 +331,7 @@ var operationCallback = function (data, textStatus) { }, dataType: "json", type: "POST", - url: get_url("organize/runTask", {task_id: task.id}) + url: get_organize_url("organize/runTask", {task_id: task.id}) }); } if (!paused) { @@ -344,7 +344,7 @@ var operationCallback = function (data, textStatus) { }, dataType: "json", type: "POST", - url: get_url("organize/finishTask", {task_id: task.id}) + url: get_organize_url("organize/finishTask", {task_id: task.id}) }); } $(".gMicroThumbContainer").draggable("enable"); @@ -438,7 +438,7 @@ function organizeOpenFolder(event) { event.preventDefault(); } -function get_url(uri, parms) { +function get_organize_url(uri, parms) { var url = rearrangeUrl; url = url.replace("__URI__", uri); url = url.replace("__ITEM_ID__", !parms.item_id ? "" : parms.item_id); @@ -501,7 +501,7 @@ function setSelectedThumbs() { function getEditForm() { if ($("#gMicroThumbGrid li.ui-selected").length > 0) { var postData = serializeItemIds("li.ui-selected"); - var url_data = get_url("organize/editForm", {}) + postData; + var url_data = get_organize_url("organize/editForm", {}) + postData; $.get(url_data, function(data, textStatus) { $("#gOrganizeEditForm").tabs("destroy"); $("#gOrganizeEditForm").html(data); @@ -585,7 +585,7 @@ function createProgressDialog(title) { }, dataType: "json", type: "POST", - url: get_url("organize/cancelTask", {task_id: task.id}) + url: get_organize_url("organize/cancelTask", {task_id: task.id}) }); }); } diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 7a41e970..41e51623 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -1064,3 +1064,4 @@ form .gError, .rtl .ui-icon-left .ui-icon { float: right; } + |