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

Use exception instead of if-statement in File::saveNew

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-09-27 12:29:38 +02:00
parent 02418cffd8
commit edb73ec480
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/File.php
View File

@ -82,14 +82,15 @@ class File extends Managed_DataObject
* @param string $given_url * @param string $given_url
* @return File * @return File
*/ */
public static function saveNew(array $redir_data, $given_url) { public static function saveNew(array $redir_data, $given_url)
{
$file = null;
// I don't know why we have to keep doing this but I'm adding this last check to avoid try {
// I don't know why we have to keep doing this but we run a last check to avoid
// uniqueness bugs. // uniqueness bugs.
$file = File::getByUrl($given_url);
$file = File::getKV('urlhash', self::hashurl($given_url)); } catch (NoResultException $e) {
if (!$file instanceof File) {
$file = new File; $file = new File;
$file->urlhash = self::hashurl($given_url); $file->urlhash = self::hashurl($given_url);
$file->url = $given_url; $file->url = $given_url;