summaryrefslogtreecommitdiff
path: root/modules/gallery/views
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2009-09-01 23:22:44 -0600
committerChad Kieffer <ckieffer@gmail.com>2009-09-01 23:22:44 -0600
commitadc7f39f7d1b3cedb0a353b3048e95479df553b0 (patch)
tree503e18f2525b64aa7934005c812ec8427c979a3d /modules/gallery/views
parentbc147d1c6c95c1ba1394f0198d9e5b810071a4ac (diff)
parentd26f9147a000ed907695b5fa593ee9c1d9b3354d (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/views')
-rw-r--r--modules/gallery/views/l10n_client.html.php1
-rw-r--r--modules/gallery/views/permissions_browse.html.php5
2 files changed, 3 insertions, 3 deletions
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/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index b9af9117..99a1b7bd 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -29,7 +29,8 @@
<ul id="gMessage">
<li class="gError">
<?= t("Oh no! Your server needs a configuration change in order for you to hide photos! Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.",
- array("mod_rewrite_attrs" => html::mark_clean("href=\"http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html\" target=\"_blank\"", "apache_attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride\" target=\"_blank\""))) ?>
+ array("mod_rewrite_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html" target="_blank"'),
+ "apache_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride" target="_blank"'))) ?>
</li>
</ul>
<? endif ?>
@@ -54,4 +55,4 @@
<div id="gEditPermissionForm">
<?= $form ?>
</div>
-</div> \ No newline at end of file
+</div>