Changeset 20099 for extensions/UserCollections/include

Timestamp:

Jan 13, 2013, 12:49:45 PM (12 years ago)

Author:

mistic100

Message:

compatible with Simple, new export options

Location:

extensions/UserCollections/include

Files:

• UserCollection.class.php (modified) (4 diffs)
• events.inc.php (modified) (1 diff)

extensions/UserCollections/include/UserCollection.class.php

@@ -504 +504 @@
   function serialize($params)
   {
-    $params = array_intersect($params, array('id','file','name','url','path'));
+    $params = array_intersect($params, array('id','file','name','url','path','date_creation','collection_add_date','filesize','width','height'));
     
     $content = null;
@@ -514 +514 @@
     file,
     name,
-    path
+    path,
+    date_creation,
+    filesize,
+    width,
+    height,
+    add_date AS collection_add_date
   FROM '.IMAGES_TABLE.'
-  WHERE id IN('.implode(',', $this->images).')
+    JOIN '.COLLECTION_IMAGES_TABLE.' ON id = image_id
+  WHERE col_id = '.$this->data['id'].'
   ORDER BY id
 ;';
@@ -537 +543 @@
           switch ($field)
           {
-          case 'id':
-            $element[] = $row['id']; break;
-          case 'file':
-            $element[] = $row['file']; break;
           case 'name':
             $element[] = render_element_name($row); break;
@@ -547 +549 @@
           case 'path':
             $element[] = $root_url.ltrim($row['path'], './'); break;
+          default:
+            $element[] = $row[$field]; break;
           }
         }

extensions/UserCollections/include/events.inc.php

@@ -126 +126 @@
 {
   // add links
-  $search = '#(<span class="wrap1">|<li class="gthumb">)#';
+  $search = '#(<li>|<li class="gthumb">)#';
   $replace = '$1
 {strip}<a class="addCollection" href="{$collection_toggle_url}{$thumbnail.id}" data-id="{$thumbnail.id}" rel="nofollow">