[pLog-svn] r1794 - plog/branches/plog-1.0.1/class/gallery/dao

[oscar at devel.plogworld.net]

Author: oscar
Date: 2005-04-10 10:16:15 +0000 (Sun, 10 Apr 2005)
New Revision: 1794

Modified:
   plog/branches/plog-1.0.1/class/gallery/dao/galleryresources.class.php
Log:
fixed issue 408 (http://bugs.plogworld.net/view.php?id=408)

Turns out that the 'properties' field from the plog_gallery_resources table only exists for fresh installations of 1.0, somehow I forgot to make the changes to the wizard.php script to add the field when upgrading from 0.3.x to 1.0. In any case, I have removed those fields from the query because they're not used anyway.

Modified: plog/branches/plog-1.0.1/class/gallery/dao/galleryresources.class.php
===================================================================
--- plog/branches/plog-1.0.1/class/gallery/dao/galleryresources.class.php	2005-04-09 19:38:15 UTC (rev 1793)
+++ plog/branches/plog-1.0.1/class/gallery/dao/galleryresources.class.php	2005-04-10 10:16:15 UTC (rev 1794)
@@ -94,7 +94,7 @@
         {
         	$query = "SELECT id, owner_id, album_id, description,
         	          date, flags, resource_type, file_path, file_name,
-        	          metadata, thumbnail_format, properties
+        	          metadata, thumbnail_format
         	          FROM ".$this->getPrefix()."gallery_resources
                       WHERE id = $resourceId";
             if( $ownerId > 0 )
@@ -131,7 +131,7 @@
 			$date = $resource->getDate();
 			$query = "SELECT id, owner_id, album_id, description,
         	                 date, flags, resource_type, file_path, file_name,
-        	                 metadata, thumbnail_format, properties 
+        	                 metadata, thumbnail_format 
         	          FROM {$prefix}gallery_resources 
 			          WHERE album_id = '$albumId' AND date > '$date' 
 					  ORDER BY date ASC LIMIT 1";
@@ -164,7 +164,7 @@
 			$date = $resource->getDate();
 			$query = "SELECT id, owner_id, album_id, description,
         	                 date, flags, resource_type, file_path, file_name,
-        	                 metadata, thumbnail_format, properties 
+        	                 metadata, thumbnail_format 
         	          FROM {$prefix}gallery_resources 
 			          WHERE album_id = '$albumId' AND date < '$date' 
 					  ORDER BY date DESC LIMIT 1";
@@ -197,7 +197,7 @@
         {
         	$query = "SELECT id, owner_id, album_id, description,
         	                 date, flags, resource_type, file_path, file_name,
-        	                 metadata, thumbnail_format, properties 
+        	                 metadata, thumbnail_format 
         	          FROM ".$this->getPrefix()."gallery_resources
                       WHERE owner_id = '".Db::qstr($ownerId)."'";
             if( $albumId > GALLERY_NO_ALBUM )
@@ -588,7 +588,7 @@
         {
         	$query = "SELECT id, owner_id, album_id, description,
         	          date, flags, resource_type, file_path, file_name,
-        	          metadata, thumbnail_format, properties 
+        	          metadata, thumbnail_format 
         	          FROM ".$this->getPrefix()."gallery_resources
                       WHERE owner_id = $ownerId AND
                       file_name = '$fileName'";