Skip to content

Commit

Permalink
removed subdomains from images to help with added SSL to site
Browse files Browse the repository at this point in the history
  • Loading branch information
cbulock committed Apr 18, 2014
1 parent 3a772a8 commit 86ec64c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ public function get($image, $sid=NULL, $brazzify = FALSE) {
$result['height'] = $result['media']['primary']['height'];
$siteURL = $this->siteURL();
$result['image_url'] = $siteURL['scheme'] .'://media.' . $siteURL['host']. $result['media']['primary']['file'];
if (isset($result['media']['thumb']['file'])) $result['thumb_url'] = $siteURL['scheme'] .'://thumbs.' . $siteURL['host']. $result['media']['thumb']['file'];
if (isset($result['media']['thumb']['file'])) $result['thumb_url'] = $siteURL['scheme'] .'://' . $siteURL['host']. $result['media']['thumb']['file'];
//this can probably stay after the BC is removed
$result['page_url'] = $setting->get('web_root') . $result['uid'];
//Get tags
Expand Down
2 changes: 1 addition & 1 deletion src/core/Media.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function get($uid) {
foreach ($results as $m) {
$result[$m['type']] = $m;
$siteURL = $this->siteURL();
$result[$m['type']]['url'] = $siteURL['scheme'] .'://' . $m['type'] . '.' . $siteURL['host'] . $result[$m['type']]['file'];
$result[$m['type']]['url'] = $siteURL['scheme'] .'://' . $siteURL['host'] . $result[$m['type']]['file'];
$result[$m['type']]['readable_size'] = $bytesize->format($result[$m['type']]['size']);
}
return $result;
Expand Down

0 comments on commit 86ec64c

Please sign in to comment.