Merge pull request #7172 from nupplaphil/task/mod_notice_rm

Remove src/Module/Notice

diff --git a/src/App/Router.php b/src/App/Router.php
index 796845fbb7b080e615fbcd55312d4745243c1c83..9e4cd8fc648dfe946ae6279066f28a49736ee5f7 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -167,7 +167,6 @@ class Router
                        $collector->addRoute(['GET'], '/view/{id:\d+}',                      Module\Notifications\Notify::class);
                        $collector->addRoute(['GET'], '/mark/all',                           Module\Notifications\Notify::class);
                });
-               $this->routeCollector->addRoute(['GET'],         '/notice/{id:\d+}',     Module\GnuSocial\Notice::class);
                $this->routeCollector->addRoute(['GET'],         '/objects/{guid}',      Module\Objects::class);
                $this->routeCollector->addGroup('/oembed', function (RouteCollector $collector) {
                        $collector->addRoute(['GET'], '/b2h',                                Module\Oembed::class);

diff --git a/src/Module/GnuSocial/Notice.php b/src/Module/GnuSocial/Notice.php
deleted file mode 100644 (file)
index 88598ff..0000000
--- a/src/Module/GnuSocial/Notice.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Friendica\Module\GnuSocial;
-
-use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Database\DBA;
-use Friendica\Network\HTTPException;
-
-/**
- * GNU Social -> friendica items permanent-url compatibility
- */
-class Notice extends BaseModule
-{
-       public static function content()
-       {
-               $a = self::getApp();
-
-               // @TODO: Replace with parameter from router
-               $id = ($a->argc > 1) ? $a->argv[1] : 0;
-
-               if (empty($id)) {
-                       throw new HTTPException\NotFoundException(L10n::t('Item not found.'));
-               }
-
-               $item = DBA::selectFirst('item', ['guid'], ['id' => $id]);
-
-               if (empty($item )) {
-                       throw new HTTPException\NotFoundException(L10n::t('Item not found.'));
-               } else {
-                       $a->internalRedirect('display/' . $item['guid']);
-               }
-       }
-}