diff options
| -rw-r--r-- | index.php | 1 | ||||
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 20 | ||||
| -rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 4 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_menu.php | 4 | ||||
| -rw-r--r-- | modules/gallery/helpers/theme.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/admin_block_welcome.html.php | 4 | ||||
| -rw-r--r-- | modules/gallery/views/admin_theme_options.html.php (renamed from modules/gallery/views/admin_theme_details.html.php) | 2 |
7 files changed, 22 insertions, 15 deletions
@@ -62,6 +62,7 @@ if (PHP_SAPI == "cli") { @mkdir("test/var/logs", 0777, true); define("VARPATH", realpath("test/var") . "/"); @copy("var/database.php", VARPATH . "database.php"); + break; default: print "Usage: php index.php { upgrade | package | test }\n"; diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index a6c21489..441c922a 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -425,13 +425,19 @@ class g2_import_Core { case "GalleryMovieItem": // @todo we should transcode other types into FLV if (in_array($g2_item->getMimeType(), array("video/mp4", "video/x-flv"))) { - $item = movie::create( - $parent, - $g2_path, - $g2_item->getPathComponent(), - $g2_item->getTitle(), - self::extract_description($g2_item), - self::map($g2_item->getOwnerId())); + try { + $item = movie::create( + $parent, + $g2_path, + $g2_item->getPathComponent(), + $g2_item->getTitle(), + self::extract_description($g2_item), + self::map($g2_item->getOwnerId())); + } catch (Exception $e) { + Kohana::log("alert", "Corrupt movie $g2_path\n" . + $e->getMessage() . "\n" . $e->getTraceAsString()); + $corrupt = 1; + } } break; diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 85525a81..c0ee2b17 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -52,7 +52,7 @@ <?= 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_details"))) ?> + "url" => url::site("admin/theme_options"))) ?> </div> <? endif ?> @@ -61,7 +61,7 @@ <?= 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_details"))) ?> + "url" => url::site("admin/theme_options"))) ?> </div> <? endif ?> diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php index 9729a868..fd4ec241 100644 --- a/modules/gallery/helpers/gallery_menu.php +++ b/modules/gallery/helpers/gallery_menu.php @@ -144,9 +144,9 @@ class gallery_menu_Core { ->label(t("Theme Choice")) ->url(url::site("admin/themes"))) ->append(Menu::factory("link") - ->id("theme_details") + ->id("theme_options") ->label(t("Theme Options")) - ->url(url::site("admin/theme_details")))) + ->url(url::site("admin/theme_options")))) ->append(Menu::factory("link") ->id("maintenance") ->label(t("Maintenance")) diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php index af340db6..0a43f25c 100644 --- a/modules/gallery/helpers/theme.php +++ b/modules/gallery/helpers/theme.php @@ -40,7 +40,7 @@ class theme_Core { } static function get_edit_form_admin() { - $form = new Forge("admin/theme_details/save/", "", null, array("id" =>"gThemeDetailsForm")); + $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"gThemeOptionsForm")); $group = $form->group("edit_theme"); $group->input("page_size")->label(t("Items per page"))->id("gPageSize") ->rules("required|valid_digit") diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php index a453b006..38d2bd56 100644 --- a/modules/gallery/views/admin_block_welcome.html.php +++ b/modules/gallery/views/admin_block_welcome.html.php @@ -9,9 +9,9 @@ "language_url" => url::site("admin/languages"))) ?> </li> <li> - <?= t("Appearance - <a href=\"%theme_url\">choose a theme</a>, or <a href=\"%theme_details_url\">customize the way it looks</a>.", + <?= t("Appearance - <a href=\"%theme_url\">choose a theme</a>, or <a href=\"%theme_options_url\">customize the way it looks</a>.", array("theme_url" => url::site("admin/themes"), - "theme_details_url" => url::site("admin/theme_details"))) ?> + "theme_options_url" => url::site("admin/theme_options"))) ?> </li> <li> <?= t("Customize - <a href=\"%modules_url\">install modules</a> to add cool features!", diff --git a/modules/gallery/views/admin_theme_details.html.php b/modules/gallery/views/admin_theme_options.html.php index f093b70b..724e6438 100644 --- a/modules/gallery/views/admin_theme_details.html.php +++ b/modules/gallery/views/admin_theme_options.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="gAdminThemeDetails"> +<div id="gAdminThemeOptions"> <h1> <?= t("Theme Options") ?> </h1> <?= $form ?> |