Changeset 801

Timestamp:

02/23/09 08:34:42 (15 years ago)

Author:

bruno

Message:

Fixed warnings in widget, flagged 0.3.3

Location:

plugins/gallery/trunk

Files:

• CHANGELOG (modified) (1 diff)
• _define.php (modified) (1 diff)
• _public_widgets.php (modified) (4 diffs)

plugins/gallery/trunk/CHANGELOG

@@ +1 @@
+Gallery 0.3.3
+* Fixed "empty post" bug
+* Fixed widget incorrect behavior and warnings
+* Enable image creation for multiple blogs having the same public_path
+
+
 Gallery 0.3.2
 * Fixed php errors in theme adapter

plugins/gallery/trunk/_define.php

@@ -16 +16 @@
      /* Description*/         "Image Gallery for Dotclear2",
      /* Author */             "Bruno Hondelatte",
-     /* Version */            '0.3.2',
+     /* Version */            '0.3.3',
      /* Permissions */        'usage,contentadmin'
 );

plugins/gallery/trunk/_public_widgets.php

@@ -45 +45 @@
 
      private static function getGalleriesInCategory($cat_id,&$rsgal,$w) {
-          $res = "<ul>";
-          while (!$rsgal->isEnd() && $rsgal->cat_id == $cat_id) {
-               $res .= '<li class="ligal">'.self::getGalleryLink($rsgal,$w);    
-
-               $rsgal->fetch();
-          }
-          $res .= "</ul>";
+          if ($rsgal != null) {
+               $res = "<ul>";
+               while (!$rsgal->isEnd() && $rsgal->cat_id == $cat_id) {
+                    $res .= '<li class="ligal">'.self::getGalleryLink($rsgal,$w);    
+
+                    $rsgal->fetch();
+               }
+               $res .= "</ul>";
+          } else {
+               $res='';
+          }
           return $res;
      }
@@ -67 +71 @@
           while (!$rscat->isEnd() && $rscat->level >= $level) {
                $rscat->fetch();
-               if ($rscat->level > $level) {
+               if ($w->cat_display == 'tree' && $rscat->level > $level) {
                     $res .= self::displayCategoryList($rscat,$rsgal,$w,$cur_cat_id);
                } 
-               if ($rscat->level == $level) {
+               if ($w->cat_display != 'tree' || $rscat->level == $level) {
                     $class='';
                     if ($rscat->cat_id == $cur_cat_id)
@@ -135 +139 @@
                $cur_cat_id = null;
 
-          if ($w->cat_display == 'tree') {
+          if ($display_cat) {
                if ($rscat->fetch()) {
                     if ($rsgal != null)
@@ -143 +147 @@
                }
                
-          } else {
+          } elseif ($rsgal != null) {
                $first=true;
                $current_cat = "dummycategoryblabla";