diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-10 20:57:53 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-02-10 20:57:53 +0000 |
| commit | 10e36fcf1b5acf07c5cc128105af03fb09aac89e (patch) | |
| tree | c5e815b0a4c540d0dc7bc5f90dd1eae3df31017e /modules/g2_import/views | |
| parent | 052476ef44ca801766cbd6bdbfe42d5a0a362e52 (diff) | |
| parent | 8ef08d20883d9b9aa0b7560ce3bf6da8a6632149 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/g2_import/views')
| -rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 6a5214a3..3b7afec2 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -13,7 +13,7 @@ </p> <ul> <li> - <?= t("Permissions are <b>not imported</b>. You will have to set them again manually (for now).") ?> + <?= t("Please <b>review album permissions</b> after the import! Permissions are imported, but user specific and item specific permissions are not supported in Gallery 3 and thus ignored.") ?> </li> <li> <?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4. Other formats will be skipped.") ?> @@ -103,7 +103,7 @@ <IfModule mod_rewrite.c><br/> RewriteEngine On<br/> RewriteBase <?= html::clean(g2_import::$g2_base_url) ?><br/> - RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?> [QSA,L]<br/> + RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?> [QSA,L,R=301]<br/> </IfModule><br/> </code> </div> |