summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/comment/views/comments.html.php2
-rw-r--r--modules/gallery/controllers/admin_languages.php2
-rw-r--r--modules/gallery/views/l10n_client.html.php1
-rw-r--r--modules/recaptcha/views/admin_recaptcha.html.php2
-rw-r--r--themes/default/views/album.html.php2
5 files changed, 4 insertions, 5 deletions
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index b7ebdf3a..7eb34c20 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -8,7 +8,7 @@
<? if (!$comments->count()): ?>
<p id="gNoCommentsYet">
<?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
- array("attrs" => "href=\"#add_comment_form\" class=\"showCommentForm\"")) ?>
+ array("attrs" => html::mark_clean("href=\"#add_comment_form\" class=\"showCommentForm\""))) ?>
</p>
<? endif ?>
<ul>
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 894daedb..d91e5205 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -61,7 +61,7 @@ class Admin_Languages_Controller extends Admin_Controller {
return $this->index($form);
}
- if ($form->sharing->share) {
+ if ($this->input->post("share")) {
l10n_client::submit_translations();
message::success(t("Translations submitted"));
} else {
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 3a43f7d3..b0f424be 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -74,7 +74,6 @@
</div>
<script type="text/javascript">
var MSG_TRANSLATE_TEXT = <?= t("Translate Text")->for_js() ?>;
- var MSG_CLOSE_X = <?= t("X")->for_js() ?>;
var l10n_client_data = <?= json_encode($string_list) ?>;
var plural_forms = <?= json_encode($plural_forms) ?>;
var toggle_l10n_mode_url = <?= html::js_string(url::site("l10n_client/toggle_l10n_mode")) ?>;
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 35722be4..0a4b1f8f 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -4,7 +4,7 @@
<p>
<?= t("reCAPTCHA is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows. In order to use it, you need to sign up for a <a href=\"%domain_url\">reCAPTCHA Public/Private Key pair</a>, which is also free. Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
array("domain_url" => $form->get_key_url,
- "recaptcha_url" => html::mark_safe("http://recaptcha.net"))) ?>
+ "recaptcha_url" => html::mark_clean("http://recaptcha.net"))) ?>
</p>
<?= $form ?>
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index caabeee3..8bc81a31 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -30,7 +30,7 @@
<? if ($user->admin || access::can("add", $item)): ?>
<? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
<li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
- array("attrs" => "href=\"$addurl\" class=\"gDialogLink\"")) ?></li>
+ array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?></li>
<? else: ?>
<li><?= t("There aren't any photos here yet!") ?></li>
<? endif; ?>