Changeset 869

Timestamp:

03/13/09 10:24:14 (14 years ago)

Author:

bruno

Message:

Fixed default gallery integration theme option bug

Location:

plugins/gallery/trunk

Files:

• class.dc.gallery.php (modified) (1 diff)
• options.php (modified) (6 diffs)

plugins/gallery/trunk/class.dc.gallery.php

@@ -102 +102 @@
                }
 
-               if ($theme == 'sameasgal' && isset($meta['galtheme'])) {
-                    return $meta['galtheme'][0];
+               if ($theme == 'sameasgal') {
+                    if (isset($meta['galtheme']))
+                         return $meta['galtheme'][0];
+                    else
+                         return $this->core->blog->settings->gallery_default_theme;
+
                } else {
                     return $theme;

plugins/gallery/trunk/options.php

@@ -27 +27 @@
      //$browser_url_prefix = $core->blog->settings->gallery_browser_url_prefix;
      $default_theme = $core->blog->settings->gallery_default_theme;
-     $default_theme_integ = $core->blog->settings->gallery_default_integ_theme;
+     $default_integ_theme = $core->blog->settings->gallery_default_integ_theme;
      $nb_images_per_page = $core->blog->settings->gallery_nb_images_per_page;
      $nb_galleries_per_page = $core->blog->settings->gallery_nb_galleries_per_page;
@@ -45 +45 @@
      //$core->blog->settings->put('gallery_browser_url_prefix',$browser_url_prefix,'string','Browser URL prefix');
      $core->blog->settings->put('gallery_default_theme',$default_theme);
-     $core->blog->settings->put('gallery_default_integ_theme',$default_theme_integ);
+     $core->blog->settings->put('gallery_default_integ_theme',$default_integ_theme);
      $core->blog->settings->put('gallery_nb_images_per_page',$nb_images_per_page);
      $core->blog->settings->put('gallery_nb_galleries_per_page',$nb_galleries_per_page);
@@ -72 +72 @@
 $c_admin_items_order=$core->blog->settings->gallery_admin_items_order;
 $c_default_theme=$core->blog->settings->gallery_default_theme;
-$c_default_theme_integ=$core->blog->settings->gallery_default_integ_theme;
+$c_default_integ_theme=$core->blog->settings->gallery_default_integ_theme;
 
 if (!empty($_POST['enable_plugin'])) {
@@ -109 +109 @@
      $c_admin_items_order = !empty($_POST['admin_items_order'])?$_POST['admin_items_order']:$c_admin_items_order;
      $c_default_theme = !empty($_POST['default_theme'])?$_POST['default_theme']:$c_default_theme;
-     $c_default_theme = !empty($_POST['default_theme'])?$_POST['default_theme']:$c_default_theme_integ;
+     $c_default_integ_theme = !empty($_POST['default_integ_theme'])?$_POST['default_integ_theme']:$c_default_integ_theme;
      $core->blog->settings->setNamespace('gallery');
      $core->blog->settings->put('gallery_nb_images_per_page',$c_nb_img);
@@ -121 +121 @@
      $core->blog->settings->put('gallery_admin_items_order',$c_admin_items_order);
      $core->blog->settings->put('gallery_default_theme',$c_default_theme);
-     $core->blog->settings->put('gallery_default_theme_integ',$c_default_theme_integ);
+     $core->blog->settings->put('gallery_default_integ_theme',$c_default_integ_theme);
      $core->blog->triggerBlog();
      http::redirect('plugin.php?p=gallery&m=options&upd=1');
@@ -256 +256 @@
           '</label></p>'.
           '<p><label class=" classic">'. __('Default gallery theme when integrated').' : '.
-          form::combo('default_theme_integ', $themes_integ, $c_default_theme_integ).
+          form::combo('default_integ_theme', $themes_integ, $c_default_integ_theme).
           '</label></p>'.
           '<h3>'.__('Administration-side options').'</h3>'.