Changeset 1280:d9627cb1cb02 for inc/core/class.dc.media.php

Timestamp:

08/06/13 10:03:57 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Backed out merge changeset: 48c827f9db99

Backed out merge revision to its first parent (5ceeeb6f5454)

File:

• inc/core/class.dc.media.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
-     @param    return_rs <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,$return_rs=false)
+     @return   <b>array</b> Array of fileItems
+     */
+     public function getPostMedia($post_id,$media_id=null)
      {
           $params = array(
@@ -516 +515 @@
                $f = $this->fileRecord($rs);
                if ($f !== null) {
-                    $res[] = $return_rs ? new ArrayObject($f) : $f;
-               }
-          }
-          
-          return $return_rs ? staticRecord::newFromArray($res) : $res;
+                    $res[] = $f;
+               }
+          }
+          
+          return $res;
      }