diff options
-rw-r--r-- | index.php | 8 | ||||
-rw-r--r-- | plugins/readityourself/readityourself.php | 2 | ||||
-rw-r--r-- | plugins/wallabag/wallabag.php | 2 | ||||
-rw-r--r-- | shaarli_version.php | 2 |
4 files changed, 7 insertions, 7 deletions
@@ -1,6 +1,6 @@ | |||
1 | <?php | 1 | <?php |
2 | /** | 2 | /** |
3 | * Shaarli v0.5.4 - Shaare your links... | 3 | * Shaarli v0.6.0 - Shaare your links... |
4 | * | 4 | * |
5 | * The personal, minimalist, super-fast, no-database Delicious clone. | 5 | * The personal, minimalist, super-fast, no-database Delicious clone. |
6 | * | 6 | * |
@@ -115,7 +115,7 @@ $GLOBALS['config']['PUBSUBHUB_URL'] = ''; | |||
115 | /* | 115 | /* |
116 | * PHP configuration | 116 | * PHP configuration |
117 | */ | 117 | */ |
118 | define('shaarli_version', '0.5.4'); | 118 | define('shaarli_version', '0.6.0'); |
119 | 119 | ||
120 | // http://server.com/x/shaarli --> /shaarli/ | 120 | // http://server.com/x/shaarli --> /shaarli/ |
121 | define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); | 121 | define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0))); |
@@ -679,8 +679,8 @@ class pageBuilder | |||
679 | $this->tpl->assign('pagetitle', $GLOBALS['pagetitle']); | 679 | $this->tpl->assign('pagetitle', $GLOBALS['pagetitle']); |
680 | } | 680 | } |
681 | $this->tpl->assign('shaarlititle', empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title']); | 681 | $this->tpl->assign('shaarlititle', empty($GLOBALS['title']) ? 'Shaarli': $GLOBALS['title']); |
682 | if (!empty($GLOBALS['plugins']['errors'])) { | 682 | if (!empty($GLOBALS['plugin_errors'])) { |
683 | $this->tpl->assign('plugin_errors', $GLOBALS['plugins']['errors']); | 683 | $this->tpl->assign('plugin_errors', $GLOBALS['plugin_errors']); |
684 | } | 684 | } |
685 | } | 685 | } |
686 | 686 | ||
diff --git a/plugins/readityourself/readityourself.php b/plugins/readityourself/readityourself.php index 68efc543..1b030bc8 100644 --- a/plugins/readityourself/readityourself.php +++ b/plugins/readityourself/readityourself.php | |||
@@ -14,7 +14,7 @@ if (is_file(PluginManager::$PLUGINS_PATH . '/readityourself/config.php')) { | |||
14 | } | 14 | } |
15 | 15 | ||
16 | if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) { | 16 | if (!isset($GLOBALS['plugins']['READITYOUSELF_URL'])) { |
17 | $GLOBALS['plugins']['errors'][] = 'Readityourself plugin error: '. | 17 | $GLOBALS['plugin_errors'][] = 'Readityourself plugin error: '. |
18 | 'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '. | 18 | 'Please define "$GLOBALS[\'plugins\'][\'READITYOUSELF_URL\']" '. |
19 | 'in "plugins/readityourself/config.php" or in your Shaarli config.php file.'; | 19 | 'in "plugins/readityourself/config.php" or in your Shaarli config.php file.'; |
20 | } | 20 | } |
diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php index 024a3d2b..37969c97 100644 --- a/plugins/wallabag/wallabag.php +++ b/plugins/wallabag/wallabag.php | |||
@@ -10,7 +10,7 @@ if (is_file(PluginManager::$PLUGINS_PATH . '/wallabag/config.php')) { | |||
10 | } | 10 | } |
11 | 11 | ||
12 | if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) { | 12 | if (!isset($GLOBALS['plugins']['WALLABAG_URL'])) { |
13 | $GLOBALS['plugins']['errors'][] = 'Wallabag plugin error: '. | 13 | $GLOBALS['plugin_errors'][] = 'Wallabag plugin error: '. |
14 | 'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '. | 14 | 'Please define "$GLOBALS[\'plugins\'][\'WALLABAG_URL\']" '. |
15 | 'in "plugins/wallabag/config.php" or in your Shaarli config.php file.'; | 15 | 'in "plugins/wallabag/config.php" or in your Shaarli config.php file.'; |
16 | } | 16 | } |
diff --git a/shaarli_version.php b/shaarli_version.php index 17f5ffab..a5f0a095 100644 --- a/shaarli_version.php +++ b/shaarli_version.php | |||
@@ -1 +1 @@ | |||
<?php /* 0.5.4 */ ?> | <?php /* 0.6.0 */ ?> | ||