Dotclear


Ignore:
Timestamp:
06/15/11 15:14:25 (14 years ago)
Author:
Dsls <dsls@…>
Branch:
default
Message:

Better support for http valued public_url and themes_url. Closes #1222

File:
1 edited

Legend:

Unmodified
Added
Removed
  • admin/media_item.php

    r270 r375  
    394394     if ($file->media_image) 
    395395     { # We look for thumbnails too 
    396           $media_root = $core->blog->host.path::clean($core->blog->settings->system->public_url).'/'; 
     396          if (preg_match('#^http(s)?://#',$this->core->blog->settings->system->public_url)) { 
     397               $media_root = $core->blog->settings->system->public_url; 
     398          } else { 
     399               $media_root = $core->blog->host.path::clean($core->blog->settings->system->public_url).'/'; 
     400          } 
    397401          foreach ($file->media_thumb as $v) { 
    398402               $v = preg_replace('/^'.preg_quote($media_root,'/').'/','',$v); 
Note: See TracChangeset for help on using the changeset viewer.

Sites map