diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-03-22 18:50:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-22 18:50:33 +0100 |
commit | 64c34078e4782d8f41e6c7f2beb7682823e99498 (patch) | |
tree | 3ba7a75ebef8b62a1abd7e819a6c14f34091ccb3 /index.php | |
parent | 36eb71fb48aa3e752a1e32774b8eead18780bf29 (diff) | |
parent | b786c8836f0576d4feb1543471950c5d24bc7939 (diff) | |
download | Shaarli-64c34078e4782d8f41e6c7f2beb7682823e99498.tar.gz Shaarli-64c34078e4782d8f41e6c7f2beb7682823e99498.tar.zst Shaarli-64c34078e4782d8f41e6c7f2beb7682823e99498.zip |
Merge pull request #816 from ArthurHoaro/project/master-version
Use 'dev' version on the master branch
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,8 +1,6 @@ | |||
1 | <?php | 1 | <?php |
2 | /** | 2 | /** |
3 | * Shaarli v0.8.3 - Shaare your links... | 3 | * Shaarli - The personal, minimalist, super-fast, database free, bookmarking service. |
4 | * | ||
5 | * The personal, minimalist, super-fast, database free, bookmarking service. | ||
6 | * | 4 | * |
7 | * Friendly fork by the Shaarli community: | 5 | * Friendly fork by the Shaarli community: |
8 | * - https://github.com/shaarli/Shaarli | 6 | * - https://github.com/shaarli/Shaarli |
@@ -25,7 +23,6 @@ if (date_default_timezone_get() == '') { | |||
25 | /* | 23 | /* |
26 | * PHP configuration | 24 | * PHP configuration |
27 | */ | 25 | */ |
28 | define('shaarli_version', '0.8.2'); | ||
29 | 26 | ||
30 | // http://server.com/x/shaarli --> /shaarli/ | 27 | // http://server.com/x/shaarli --> /shaarli/ |
31 | define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0))); | 28 | define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0))); |
@@ -90,6 +87,8 @@ try { | |||
90 | exit; | 87 | exit; |
91 | } | 88 | } |
92 | 89 | ||
90 | define('shaarli_version', ApplicationUtils::getVersion(__DIR__ .'/'. ApplicationUtils::$VERSION_FILE)); | ||
91 | |||
93 | // Force cookie path (but do not change lifetime) | 92 | // Force cookie path (but do not change lifetime) |
94 | $cookie = session_get_cookie_params(); | 93 | $cookie = session_get_cookie_params(); |
95 | $cookiedir = ''; | 94 | $cookiedir = ''; |