diff options
author | Arthur <arthur@hoa.ro> | 2016-12-15 11:41:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-15 11:41:22 +0100 |
commit | c0d96ce59005e83cd210065620aa6f3bb96e4f81 (patch) | |
tree | 3ae58e8fcf043abc8da312f6551cc1a35011bb8b /index.php | |
parent | 624f999fb75ceeefbc690276f42e5a545ad35357 (diff) | |
parent | 826c6af7c011234d6e1666a2f7f25744fcf397b7 (diff) | |
download | Shaarli-c0d96ce59005e83cd210065620aa6f3bb96e4f81.tar.gz Shaarli-c0d96ce59005e83cd210065620aa6f3bb96e4f81.tar.zst Shaarli-c0d96ce59005e83cd210065620aa6f3bb96e4f81.zip |
Merge pull request #716 from ArthurHoaro/hotfix/editoldlinks
Fix a regression: permalinks change when old links are edited
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1249,10 +1249,12 @@ function renderPage($conf, $pluginManager) | |||
1249 | // Edit | 1249 | // Edit |
1250 | $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); | 1250 | $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); |
1251 | $updated = new DateTime(); | 1251 | $updated = new DateTime(); |
1252 | $shortUrl = $LINKSDB[$id]['shorturl']; | ||
1252 | } else { | 1253 | } else { |
1253 | // New link | 1254 | // New link |
1254 | $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); | 1255 | $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); |
1255 | $updated = null; | 1256 | $updated = null; |
1257 | $shortUrl = link_small_hash($created, $id); | ||
1256 | } | 1258 | } |
1257 | 1259 | ||
1258 | // Remove multiple spaces. | 1260 | // Remove multiple spaces. |
@@ -1279,7 +1281,7 @@ function renderPage($conf, $pluginManager) | |||
1279 | 'created' => $created, | 1281 | 'created' => $created, |
1280 | 'updated' => $updated, | 1282 | 'updated' => $updated, |
1281 | 'tags' => str_replace(',', ' ', $tags), | 1283 | 'tags' => str_replace(',', ' ', $tags), |
1282 | 'shorturl' => link_small_hash($created, $id), | 1284 | 'shorturl' => $shortUrl, |
1283 | ); | 1285 | ); |
1284 | 1286 | ||
1285 | // If title is empty, use the URL as title. | 1287 | // If title is empty, use the URL as title. |