remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

[10.0.034.dev] annulation dernier commit

Browse Source
This commit is contained in:
Fred Tempez 2020-02-18 11:05:42 +01:00
parent 6be6a39a1a
commit 9b9353adbb
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/class/helper.class.php
View File

@ -130,8 +130,8 @@ class helper {
* Renvoie le numéro de version de Zwii est en ligne
* @return string
*/
public static function getOnlineVersion($channel = '') {
return (@file_get_contents('http://zwiicms.com/update' . $channel . '/version'));
public static function getOnlineVersion() {
return (@file_get_contents('http://zwiicms.com/update/version'));
}
@ -139,8 +139,8 @@ class helper {
* Check si une nouvelle version de Zwii est disponible
* @return bool
*/
public static function checkNewVersion($channel = '') {
if($version = helper::getOnlineVersion($channel)) {
public static function checkNewVersion() {
if($version = helper::getOnlineVersion()) {
//return (trim($version) !== common::ZWII_VERSION);
return ((version_compare(common::ZWII_VERSION,$version)) === -1);
}

7
core/core.php
View File

@ -35,11 +35,6 @@ class common {
// Numéro de version
const ZWII_VERSION = '10.0.034.dev';
// Laisser vide pour la version officiel
// v10 version 10
// v11 verison 11
const ZWII_UPDATE_CHANNEL = 'v10';
public static $actions = [];
public static $coreModuleIds = [
'config',
@ -2251,7 +2246,7 @@ class layout extends common {
if( $this->getData(['config','autoUpdate']) &&
$lastAutoUpdate > $this->getData(['core','lastAutoUpdate']) + 86400 ) {
$this->setData(['core','lastAutoUpdate',$lastAutoUpdate]);
if ( helper::checkNewVersion(common::ZWII_UPDATE_CHANNEL) ) {
if ( helper::checkNewVersion() ) {
$rightItems .= '<li><a id="barUpdate" href="' . helper::baseUrl() . 'install/update" data-tippy-content="Mettre à jour Zwii '. common::ZWII_VERSION .' vers '. helper::getOnlineVersion() .'">' . template::ico('update colorRed') . '</a></li>';
}
}