Merge pull request #1 from friendica/develop

[friendica.git] / src / Module / Photo.php

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 34ee4db83324c229d54d1a0d943be3d13c4f75f2..826d86bdd53327338ca82771035d6f60836d6e8f 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file src/Module/Photo.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Module;
@@ -68,13 +84,13 @@ class Photo extends BaseModule
                                }
                                $photo = MPhoto::getPhoto($photoid, $scale);
                                if ($photo === false) {
-                                       $photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
+                                       throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
                                }
                                break;
                }
 
                if ($photo === false) {
-                       System::httpExit('404', 'Not Found');
+                       throw new \Friendica\Network\HTTPException\NotFoundException();
                }
 
                $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);