Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #717 from ArthurHoaro/v0.8

Browse source 
Preparation of v0.8.2
This commit is contained in:
Arthur 2016-12-15 11:58:39 +01:00 committed by GitHub
commit 1022c59df8
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15
### Fixed
- Editing a link created before the new ID system would change its permalink.
## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12 ## [v0.8.1](https://github.com/shaarli/Shaarli/releases/tag/v0.8.1) - 2016-12-12

8
index.php
View file

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Shaarli v0.8.1 - Shaare your links... * Shaarli v0.8.2 - Shaare your links...
* *
* The personal, minimalist, super-fast, database free, bookmarking service. * The personal, minimalist, super-fast, database free, bookmarking service.
* *
@ -25,7 +25,7 @@
/* /*
* PHP configuration * PHP configuration
*/ */
define('shaarli_version', '0.8.1'); define('shaarli_version', '0.8.2');
// http://server.com/x/shaarli --> /shaarli/ // http://server.com/x/shaarli --> /shaarli/
define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0))); define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0)));
@ -1249,10 +1249,12 @@ function renderPage($conf, $pluginManager)
// Edit // Edit
$created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate);
$updated = new DateTime(); $updated = new DateTime();
$shortUrl = $LINKSDB[$id]['shorturl'];
} else { } else {
// New link // New link
$created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate); $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate);
$updated = null; $updated = null;
$shortUrl = link_small_hash($created, $id);
} }
// Remove multiple spaces. // Remove multiple spaces.
@ -1279,7 +1281,7 @@ function renderPage($conf, $pluginManager)
'created' => $created, 'created' => $created,
'updated' => $updated, 'updated' => $updated,
'tags' => str_replace(',', ' ', $tags), 'tags' => str_replace(',', ' ', $tags),
'shorturl' => link_small_hash($created, $id), 'shorturl' => $shortUrl,
); );
// If title is empty, use the URL as title. // If title is empty, use the URL as title.

2
shaarli_version.php
View file

@ -1 +1 @@
<?php /* 0.8.1 */ ?> <?php /* 0.8.2 */ ?>