Allowed check branches are now `latest` and `stable`.
class ApplicationUtils
{
private static $GIT_URL = 'https://raw.githubusercontent.com/shaarli/Shaarli';
- private static $GIT_BRANCHES = array('master', 'stable');
+ private static $GIT_BRANCHES = array('latest', 'stable');
private static $VERSION_FILE = 'shaarli_version.php';
private static $VERSION_START_TAG = '<?php /* ';
private static $VERSION_END_TAG = ' */ ?>';
$isLoggedIn,
$branch='stable')
{
- if (! $isLoggedIn) {
- // Do not check versions for visitors
- return false;
- }
-
- if (empty($enableCheck)) {
- // Do not check if the user doesn't want to
+ // Do not check versions for visitors
+ // Do not check if the user doesn't want to
+ // Do not check with dev version
+ if (! $isLoggedIn || empty($enableCheck) || $currentVersion === 'dev') {
return false;
}
<?php
/**
- * Shaarli v0.8.3 - Shaare your links...
+ * Shaarli dev - Shaare your links...
*
* The personal, minimalist, super-fast, database free, bookmarking service.
*
/*
* PHP configuration
*/
-define('shaarli_version', '0.8.2');
+define('shaarli_version', 'dev');
// http://server.com/x/shaarli --> /shaarli/
define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0)));
-<?php /* 0.8.3 */ ?>
+<?php /* dev */ ?>
ApplicationUtils::checkResourcePermissions($conf)
);
}
+
+ /**
+ * Check update with 'dev' as curent version (master branch).
+ * It should always return false.
+ */
+ public function testCheckUpdateDev()
+ {
+ $this->assertFalse(
+ ApplicationUtils::checkUpdate('dev', self::$testUpdateFile, 100, true, true)
+ );
+ }
}