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

Rename shaarli_version constant to uppercase

Browse source
This commit is contained in:
ArthurHoaro 2017-10-01 11:09:12 +02:00
parent bfe4f536bb
commit b3e1f92e9c
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/PageBuilder.php
View file

@ -49,7 +49,7 @@ private function initialize()
try { try {
$version = ApplicationUtils::checkUpdate( $version = ApplicationUtils::checkUpdate(
shaarli_version, SHAARLI_VERSION,
$this->conf->get('resource.update_check'), $this->conf->get('resource.update_check'),
$this->conf->get('updates.check_updates_interval'), $this->conf->get('updates.check_updates_interval'),
$this->conf->get('updates.check_updates'), $this->conf->get('updates.check_updates'),
@ -75,7 +75,7 @@ private function initialize()
} }
$this->tpl->assign('searchcrits', $searchcrits); $this->tpl->assign('searchcrits', $searchcrits);
$this->tpl->assign('source', index_url($_SERVER)); $this->tpl->assign('source', index_url($_SERVER));
$this->tpl->assign('version', shaarli_version); $this->tpl->assign('version', SHAARLI_VERSION);
$this->tpl->assign( $this->tpl->assign(
'version_hash', 'version_hash',
ApplicationUtils::getVersionHash(SHAARLI_VERSION, $this->conf->get('credentials.salt')) ApplicationUtils::getVersionHash(SHAARLI_VERSION, $this->conf->get('credentials.salt'))

4
application/Updater.php
View file

@ -398,7 +398,7 @@ public function updateMethodAtomDefault()
*/ */
public function updateMethodCheckUpdateRemoteBranch() public function updateMethodCheckUpdateRemoteBranch()
{ {
if (shaarli_version === 'dev' || $this->conf->get('updates.check_updates_branch') === 'latest') { if (SHAARLI_VERSION === 'dev' || $this->conf->get('updates.check_updates_branch') === 'latest') {
return true; return true;
} }
@ -413,7 +413,7 @@ public function updateMethodCheckUpdateRemoteBranch()
$latestMajor = $matches[1]; $latestMajor = $matches[1];
// Get current major version digit // Get current major version digit
preg_match('/(\d+)\.\d+$/', shaarli_version, $matches); preg_match('/(\d+)\.\d+$/', SHAARLI_VERSION, $matches);
$currentMajor = $matches[1]; $currentMajor = $matches[1];
if ($currentMajor === $latestMajor) { if ($currentMajor === $latestMajor) {

2
index.php
View file

@ -88,7 +88,7 @@
exit; exit;
} }
define('shaarli_version', ApplicationUtils::getVersion(__DIR__ .'/'. ApplicationUtils::$VERSION_FILE)); define('SHAARLI_VERSION', ApplicationUtils::getVersion(__DIR__ .'/'. ApplicationUtils::$VERSION_FILE));
// Force cookie path (but do not change lifetime) // Force cookie path (but do not change lifetime)
$cookie = session_get_cookie_params(); $cookie = session_get_cookie_params();