X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=8eb36d81a766831ca9e189a53f83267feee72eb3;hb=b848615c52660f9e3173ab7eedab29af0c49a4fc;hp=d1eee09850e1dac86531be917c7c5c3a3d3e12ec;hpb=6f566b69ba141c29fb3fa1e32a1760a1e8b09840;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index d1eee098..8eb36d81 100644 --- a/index.php +++ b/index.php @@ -2232,12 +2232,13 @@ $app = new \Slim\App($container); $app->group('/api/v1', function() { $this->get('/info', '\Shaarli\Api\Controllers\Info:getInfo'); $this->get('/links', '\Shaarli\Api\Controllers\Links:getLinks'); + $this->get('/links/{id:[\d]+}', '\Shaarli\Api\Controllers\Links:getLink'); })->add('\Shaarli\Api\ApiMiddleware'); $response = $app->run(true); // Hack to make Slim and Shaarli router work together: -// If a Slim route isn't found, we call renderPage(). -if ($response->getStatusCode() == 404) { +// If a Slim route isn't found and NOT API call, we call renderPage(). +if ($response->getStatusCode() == 404 && strpos($_SERVER['REQUEST_URI'], '/api/v1') === false) { // We use UTF-8 for proper international characters handling. header('Content-Type: text/html; charset=utf-8'); renderPage($conf, $pluginManager, $linkDb);