X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=8eb36d81a766831ca9e189a53f83267feee72eb3;hb=e03761011521929a375ebb56f21adacb226a3a8d;hp=b62149f647f469556d1f1a5c99120e22a9702aac;hpb=89dcbe52775bac8d544448ff4f80b6256875de91;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index b62149f6..8eb36d81 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ 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);