Changes in [1264:38c7871e116e:1269:383c341506b4]

Files:

• inc/core/class.dc.media.php (modified) (2 diffs)
• plugins/attachments/_public.php (modified) (2 diffs)

inc/core/class.dc.media.php

@@ -497 +497 @@
      @param    post_id   <b>integer</b>      Post ID
      @param    media_id  <b>integer</b>      Optionnal media ID
-     @return   <b>array</b> Array of fileItems
-     */
-     public function getPostMedia($post_id,$media_id=null)
+     @param    $returnRs <b>boolean</b>      Whether to return a resultset (true) or an array (false, default value).
+     @return   <b>array</b> Array or ResultSet of fileItems
+     */
+     public function getPostMedia($post_id,$media_id=null,$returnRs=false)
      {
           $params = array(
@@ -515 +516 @@
                $f = $this->fileRecord($rs);
                if ($f !== null) {
-                    $res[] = new ArrayObject($f);
-               }
-          }
-          
-          return $res;
+                    $res[] = $returnRs ? new ArrayObject($f) : $f;
+               }
+          }
+          
+          return $returnRs ? staticRecord::newFromArray($res) : $res;
      }
      

plugins/attachments/_public.php

@@ -40 +40 @@
           "<?php\n".
           'if ($_ctx->posts !== null && $core->media) {'."\n".
-          '$_ctx->attachments = staticRecord::newFromArray($core->media->getPostMedia($_ctx->posts->post_id));'."\n".
+          '$_ctx->attachments = $core->media->getPostMedia($_ctx->posts->post_id, null, true);'."\n".
           "?>\n".
           
@@ -46 +46 @@
           '<?php while ($_ctx->attachments->fetch()) : ?>'.
           
-          '<?php $GLOBALS[\'attach_i\'] = $attach_i; $attach_f = $_ctx->attachments->row(); $GLOBALS[\'attach_f\'] = $attach_f;'. // LEGACY
+          '<?php $GLOBALS[\'attach_i\'] = $attach_i; $attach_f = $_ctx->attachments; $GLOBALS[\'attach_f\'] = $attach_f;'. // LEGACY
           '$_ctx->file_url = $attach_f->file_url; ?>'. // LEGACY
           $content.