summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-11-19 11:43:44 -0800
committerTim Almdal <tnalmdal@shaw.ca>2009-11-19 11:43:44 -0800
commit4db92d53b0873b9ba84329e1babd2519088fb56e (patch)
tree586985b4b523b2decec64ab0aebce2298805f8d2 /modules
parente1cc8a37b2734a144b845b07db031afa971c43ce (diff)
Revert "Make sure that calls to the theme::get_var() have sane defaults in the event that the theme does not supply them."
This reverts commit 51f2b547672ab69a7a04d37b723c6afbeb584a59.
Diffstat (limited to 'modules')
-rw-r--r--modules/g2_import/controllers/admin_g2_import.php4
-rw-r--r--modules/g2_import/helpers/g2_import.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index 99d28fd7..6ed92c37 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -35,8 +35,8 @@ class Admin_g2_import_Controller extends Admin_Controller {
if (g2_import::is_initialized()) {
$view->content->g2_stats = $g2_stats;
$view->content->g2_sizes = $g2_sizes;
- $view->content->thumb_size = theme::get_var("thumb_size", 200);
- $view->content->resize_size = theme::get_var("resize_size", 640);
+ $view->content->thumb_size = theme::get_var("thumb_size");
+ $view->content->resize_size = theme::get_var("resize_size");
}
print $view;
}
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 519da40f..61a7ef85 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -671,8 +671,8 @@ class g2_import_Core {
$g2_item_id = self::$current_g2_item->getId();
$derivatives = g2(GalleryCoreApi::fetchDerivativesByItemIds(array($g2_item_id)));
- $target_thumb_size = theme::get_var("thumb_size", 200);
- $target_resize_size = theme::get_var("resize_size", 640);
+ $target_thumb_size = theme::get_var("thumb_size");
+ $target_resize_size = theme::get_var("resize_size");
if (!empty($derivatives[$g2_item_id])) {
foreach ($derivatives[$g2_item_id] as $derivative) {
if ($derivative->getPostFilterOperations()) {