Changeset 1718:5bbbd8bb73fb for inc/core

Timestamp:

09/04/13 14:28:18 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1719:b8c48f380463, 1720:f23f530dfb4a

Parents:

1717:9df047961e9c (diff), 1710:f6287a0366e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 branch into default

Files:

• inc/core/class.dc.media.php (modified) (2 diffs)
• inc/core/class.dc.media.php (modified) (3 diffs)

inc/core/class.dc.media.php

@@ -516 +516 @@
      @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(
@@ -535 +534 @@
                $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;
      }
      

inc/core/class.dc.media.php

@@ -74 +74 @@
           
           if (!is_dir($root)) {
-               throw new Exception(sprintf(__('Directory %s does not exist.'),$root));
+               # Check public directory
+               if ( $core->auth->isSuperAdmin() ) {
+                    throw new Exception(__("There is no writable directory /public/ at the location set in about:config \"public_path\". You must create this directory with sufficient rights (or change this setting)."));
+               } else {
+                    throw new Exception(__("There is no writable root directory for the media manager. You should contact your administrator."));
+               }
           }
           
@@ -299 +304 @@
                $f->media_thumb = array();
                $p = path::info($f->relname);
+
                $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
+
                $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root.'/'.$p['dirname'],$p['base'],'%s');
                $thumb_url = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root_url.$p['dirname'],$p['base'],'%s');
@@ -306 +313 @@
                $thumb_url = preg_replace('#\./#','/',$thumb_url);
                $thumb_url = preg_replace('#(?<!:)/+#','/',$thumb_url);
+
+               if ($alpha) {
+                    $thumb_alt = sprintf($this->thumb_tp,$this->root.'/'.$p['dirname'],$p['base'],'%s');
+                    $thumb_url_alt = sprintf($this->thumb_tp,$this->root_url.$p['dirname'],$p['base'],'%s');
+                    # Cleaner URLs
+                    $thumb_url_alt = preg_replace('#\./#','/',$thumb_url_alt);
+                    $thumb_url_alt = preg_replace('#(?<!:)/+#','/',$thumb_url_alt);
+               }
                
                foreach ($this->thumb_sizes as $suffix => $s) {
                     if (file_exists(sprintf($thumb,$suffix))) {
                          $f->media_thumb[$suffix] = sprintf($thumb_url,$suffix);
+                    } elseif ($alpha && file_exists(sprintf($thumb_alt,$suffix))) {
+                         $f->media_thumb[$suffix] = sprintf($thumb_url_alt,$suffix);
                     }
                }