permalinks

diff --git a/lib/data.php b/lib/data.php
index 7d26c3605122bfe3eaab74d52492d2245447e8f9..e20e40274b29bbadc54905efacb3f7afa0396524 100644 (file)
--- a/lib/data.php
+++ b/lib/data.php
@@ -113,9 +113,9 @@ function parse_entry($fileInfo, $page = 0)
        $file['timestamp'] = $file['config']['date'] ? date('U', strtotime( $file['config']['date'])) : $fileInfo->getCTime();
        $file['tags'] = $file['config']['tags'] ? explode(" ", $file['config']['tags']) : null;
        $file['content'] = Markdown($content);
-       $file['cat'] = $page ? null : substr(clean_slashes(str_replace(LOCAL_ROOT . CONTENT_DIR, "", $fileInfo->getPath())),1);
+       $file['cat'] = $page? null : substr(clean_slashes(str_replace(LOCAL_ROOT . CONTENT_DIR, "", $fileInfo->getPath())),1);
        $file['path'] = $fileInfo->getRealPath();
-       $file['url'] = WEB_ROOT . $file['cat'] . $fileInfo->getFilename();
+       $file['url'] = WEB_ROOT . ($page ? '' : $file['cat'] . '/' ) . $fileInfo->getFilename();
 
        return $file;
 }