Changeset 375:91268cf48758

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

Location:

admin

Files:

• blog_theme.php (modified) (1 diff)
• media_item.php (modified) (1 diff)

admin/blog_theme.php

@@ -156 +156 @@
      
      $radio_id = 'theme_'.html::escapeHTML($id);
-     $theme_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$id);
+     if (preg_match('#^http(s)?://#',$core->blog->settings->system->themes_url)) {
+          $theme_url = http::concatURL($core->blog->settings->system->themes_url,'/'.$id);
+     } else {
+          $theme_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$id);
+     }
      $has_conf = file_exists(path::real($core->blog->themes_path.'/'.$id).'/_config.php');
      $has_css = file_exists(path::real($core->blog->themes_path.'/'.$id).'/style.css');

admin/media_item.php

@@ -394 +394 @@
      if ($file->media_image)
      { # We look for thumbnails too
-          $media_root = $core->blog->host.path::clean($core->blog->settings->system->public_url).'/';
+          if (preg_match('#^http(s)?://#',$this->core->blog->settings->system->public_url)) {
+               $media_root = $core->blog->settings->system->public_url;
+          } else {
+               $media_root = $core->blog->host.path::clean($core->blog->settings->system->public_url).'/';
+          }
           foreach ($file->media_thumb as $v) {
                $v = preg_replace('/^'.preg_quote($media_root,'/').'/','',$v);