diff options
author | VirtualTam <virtualtam+github@flibidi.net> | 2017-08-27 13:12:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-27 13:12:58 +0200 |
commit | e8cef3ac43d5a50485c72ea2e8267e92b00be609 (patch) | |
tree | e45ad82f528afd1b8a126efb8d50bb4a01dda779 /index.php | |
parent | 5941c4216d804da5dfec9eeafa676105576bd0d1 (diff) | |
parent | cc8f572bc063aa1e9d0368c8a8361f15efe04c9b (diff) | |
download | Shaarli-e8cef3ac43d5a50485c72ea2e8267e92b00be609.tar.gz Shaarli-e8cef3ac43d5a50485c72ea2e8267e92b00be609.tar.zst Shaarli-e8cef3ac43d5a50485c72ea2e8267e92b00be609.zip |
Merge pull request #942 from thewilli/fix-wiki-links
migrated Github wiki links to readthedocs
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -48,8 +48,8 @@ if (! file_exists(__DIR__ . '/vendor/autoload.php')) { | |||
48 | ."If you installed Shaarli through Git or using the development branch,\n" | 48 | ."If you installed Shaarli through Git or using the development branch,\n" |
49 | ."please refer to the installation documentation to install PHP" | 49 | ."please refer to the installation documentation to install PHP" |
50 | ." dependencies using Composer:\n" | 50 | ." dependencies using Composer:\n" |
51 | ."- https://github.com/shaarli/Shaarli/wiki/Server-requirements\n" | 51 | ."- https://shaarli.readthedocs.io/en/master/Server-requirements/\n" |
52 | ."- https://github.com/shaarli/Shaarli/wiki/Download-and-Installation"; | 52 | ."- https://shaarli.readthedocs.io/en/master/Download-and-Installation/"; |
53 | exit; | 53 | exit; |
54 | } | 54 | } |
55 | require_once 'inc/rain.tpl.class.php'; | 55 | require_once 'inc/rain.tpl.class.php'; |
@@ -1225,7 +1225,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) | |||
1225 | // Linkdate is kept here to: | 1225 | // Linkdate is kept here to: |
1226 | // - use the same permalink for notes as they're displayed when creating them | 1226 | // - use the same permalink for notes as they're displayed when creating them |
1227 | // - let users hack creation date of their posts | 1227 | // - let users hack creation date of their posts |
1228 | // See: https://github.com/shaarli/Shaarli/wiki/Datastore-hacks#changing-the-timestamp-for-a-link | 1228 | // See: https://shaarli.readthedocs.io/en/master/Various-hacks/#changing-the-timestamp-for-a-shaare |
1229 | $linkdate = escape($_POST['lf_linkdate']); | 1229 | $linkdate = escape($_POST['lf_linkdate']); |
1230 | if (isset($LINKSDB[$id])) { | 1230 | if (isset($LINKSDB[$id])) { |
1231 | // Edit | 1231 | // Edit |