summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-09-06 22:20:32 -0700
committerBharat Mediratta <bharat@menalto.com>2010-09-06 22:20:32 -0700
commit7c80bc0c3db1ca20ce424a36a05f1337de9e1e31 (patch)
tree928e6d600a6f8720d0caf04ad9799a19c9042d12
parentfa1fe47b6a0a377929a70748406eae589ecf2a00 (diff)
parent2f94dfc67c809ae356e5d3e1a5ab21c7ba0a2a27 (diff)
Merge branch 'master' of github.com:gallery/gallery3
-rw-r--r--modules/g2_import/views/admin_g2_import.html.php13
1 files changed, 6 insertions, 7 deletions
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 05cbab71..8ec4b5ce 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -99,13 +99,12 @@
<?= t("Once your migration is complete, put this block at the top of your gallery2/.htaccess file and all Gallery 2 urls will be redirected to Gallery 3") ?>
</p>
- <code>
- &lt;IfModule mod_rewrite.c&gt;<br/>
- RewriteEngine On<br/>
- RewriteBase <?= html::clean(g2_import::$g2_base_url) ?><br/>
- RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?> [QSA,L,R=301]<br/>
- &lt;/IfModule&gt;<br/>
- </code>
+ <textarea rows="2">&lt;IfModule mod_rewrite.c&gt;
+ Options +FollowSymLinks
+ RewriteEngine On
+ RewriteBase <?= html::clean(g2_import::$g2_base_url) ?>
+ RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?> [QSA,L,R=301]
+&lt;/IfModule&gt;</textarea>
</div>
<? endif ?>
</div>