diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-30 16:20:52 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-30 16:20:52 -0700 |
| commit | 7015948357f91e79bb10595cd7c6bc2513d0863e (patch) | |
| tree | d272757f1dc1e38426eeea80399b6313ea247adc /modules/g2_import | |
| parent | 74e204b557618520d7bc56266a25d230946f02e7 (diff) | |
| parent | e4eedadcbb42e831f9649e6b52bd1ee9bf86f544 (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Diffstat (limited to 'modules/g2_import')
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 2 | ||||
| -rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 436cef52..7e5c6f75 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -590,7 +590,7 @@ class g2_import_Core { self::map($g2_comment->getId(), $comment->id); return t("Imported comment '%comment' for item with id: %id", array("id" => $comment->item_id, - "comment" => text::limit_words(nl2br(p::purify($comment->text)), 50))); + "comment" => text::limit_words(nl2br(html::purify($comment->text)), 50))); } /** diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index da2bb5d1..fde3464b 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -37,9 +37,9 @@ <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?> <li class="gWarning"> <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.", - array("g2_pixels" => $g2_sizes["thumb"]["size"], - "g3_pixels" => $thumb_size, - "url" => url::site("admin/theme_options"))) ?> + array("g2_pixels" => $g2_sizes["thumb"]["size"], + "g3_pixels" => $thumb_size, + "url" => html::mark_safe(url::site("admin/theme_options")))) ?> </li> <? endif ?> @@ -47,8 +47,8 @@ <li class="gWarning"> <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.", array("g2_pixels" => $g2_sizes["resize"]["size"], - "g3_pixels" => $resize_size, - "url" => url::site("admin/theme_options"))) ?> + "g3_pixels" => $resize_size, + "url" => html::mark_safe(url::site("admin/theme_options")))) ?> </li> <? endif ?> </ul> |