mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-06-21 17:09:54 -04:00
The fact that we have a path to a G2 embed file doesn't mean that it's still
valid so check to see that it's ok before proceeding. This should resolve #458.
This commit is contained in:
committed by
Tim Almdal
parent
f5eb5d5d70
commit
b2afba1db1
@@ -33,7 +33,7 @@ class Admin_g2_import_Controller extends Admin_Controller {
|
||||
$view->page_title = t("Gallery 2 import");
|
||||
$view->content = new View("admin_g2_import.html");
|
||||
$view->content->form = $this->_get_import_form();
|
||||
$view->content->version = '';
|
||||
$view->content->version = "";
|
||||
|
||||
if (g2_import::is_initialized()) {
|
||||
$view->content->g2_stats = $g2_stats;
|
||||
@@ -41,6 +41,8 @@ class Admin_g2_import_Controller extends Admin_Controller {
|
||||
$view->content->thumb_size = module::get_var("gallery", "thumb_size");
|
||||
$view->content->resize_size = module::get_var("gallery", "resize_size");
|
||||
$view->content->version = g2_import::version();
|
||||
} else if (g2_import::is_configured()) {
|
||||
$view->content->form->configure_g2_import->embed_path->add_error("invalid", 1);
|
||||
}
|
||||
g2_import::restore_error_reporting();
|
||||
print $view;
|
||||
|
||||
Reference in New Issue
Block a user