GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'nightly' into 'nightly' 

fixes this issue: https://quitter.se/notice/4344600



See merge request !71
This commit is contained in:
mmn 2015-12-30 15:38:19 +00:00
parent c0ef167514 08be0e5c67
commit ad5d5f8054
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/File.php
View File

@ -424,7 +424,11 @@ class File extends Managed_DataObject
if (self::hashurl($url) !== $this->urlhash) {
// 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);
try {
$this->updateUrl($url);
} catch (ServerException $e) {
//
}
}
return $url;
}
@ -656,4 +660,4 @@ class File extends Managed_DataObject
echo "DONE.\n";
echo "Resuming core schema upgrade...";
}
}
}