aboutsummaryrefslogtreecommitdiff
path: root/classes/File.php
diff options
context:
space:
mode:
authorMikael Nordfeldth <mmn@hethane.se>2015-01-12 19:22:10 +0100
committerMikael Nordfeldth <mmn@hethane.se>2015-01-12 19:22:10 +0100
commit3927acdde547a2d908f91358360bd99c20c94a04 (patch)
tree4a08083316f75f396096b22876db50fa95bbd3a0 /classes/File.php
parentcbb7ec07a58e44ffa4f98328511869eee2d6cd43 (diff)
downloadgnu-social-3927acdde547a2d908f91358360bd99c20c94a04.tar
gnu-social-3927acdde547a2d908f91358360bd99c20c94a04.zip
getUrl() fixed for File and File_thumbnail to correct http/https stuff and other
Diffstat (limited to 'classes/File.php')
-rw-r--r--classes/File.php31
1 files changed, 31 insertions, 0 deletions
diff --git a/classes/File.php b/classes/File.php
index 1edc89d5d7..3bbdcbe990 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -453,11 +453,42 @@ class File extends Managed_DataObject
{
return self::path($this->filename);
}
+
public function getUrl()
{
+ if (!empty($this->filename)) {
+ // A locally stored file, so let's generate a URL for our instance.
+ $url = self::url($this->filename);
+ if ($url != $this->url) {
+ // For indexing purposes, in case we do a lookup on the 'url' field.
+ // also we're fixing possible changes from http to https, or paths
+ $this->updateUrl($url);
+ }
+ return $url;
+ }
+
+ // No local filename available, return the URL we have stored
return $this->url;
}
+ public function updateUrl($url)
+ {
+ $file = File::getKV('url', $url);
+ if ($file instanceof File) {
+ throw new ServerException('URL already exists in DB');
+ }
+ $sql = 'UPDATE %1$s SET url=%2$s WHERE url=%3$s;';
+ $result = $this->query(sprintf($sql, $this->__table,
+ $this->_quote((string)$url),
+ $this->_quote((string)$this->url)));
+ if ($result === false) {
+ common_log_db_error($this, 'UPDATE', __FILE__);
+ throw new ServerException("Could not UPDATE {$this->__table}.url");
+ }
+
+ return $result;
+ }
+
/**
* Blow the cache of notices that link to this URL
*