From: Arthur Date: Thu, 15 Dec 2016 10:41:22 +0000 (+0100) Subject: Merge pull request #716 from ArthurHoaro/hotfix/editoldlinks X-Git-Tag: v0.9.0~89 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c0d96ce59005e83cd210065620aa6f3bb96e4f81;hp=624f999fb75ceeefbc690276f42e5a545ad35357;p=github%2Fshaarli%2FShaarli.git Merge pull request #716 from ArthurHoaro/hotfix/editoldlinks Fix a regression: permalinks change when old links are edited --- diff --git a/index.php b/index.php index cc448352..a0a3a8c7 100644 --- a/index.php +++ b/index.php @@ -1249,10 +1249,12 @@ function renderPage($conf, $pluginManager) // Edit $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); $updated = new DateTime(); + $shortUrl = $LINKSDB[$id]['shorturl']; } else { // New link $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); $updated = null; + $shortUrl = link_small_hash($created, $id); } // Remove multiple spaces. @@ -1279,7 +1281,7 @@ function renderPage($conf, $pluginManager) 'created' => $created, 'updated' => $updated, 'tags' => str_replace(',', ' ', $tags), - 'shorturl' => link_small_hash($created, $id), + 'shorturl' => $shortUrl, ); // If title is empty, use the URL as title.