Merge branch 'master' into 11000

This commit is contained in:
fredtempez 2021-03-21 03:46:45 +01:00
commit eee99d43f9
2 changed files with 1 additions and 25 deletions

View File

@ -64,7 +64,7 @@ class helper {
function_exists('stream_get_contents') && function_exists('stream_get_contents') &&
ini_get('allow_url_fopen')){ ini_get('allow_url_fopen')){
$handle = fopen ($url, "r"); $handle = fopen ($url, "r");
$url_get_contents_data = stream_get_contents($handle); $url_get_contents_data = stream_get_contents($handle);
}else{ }else{
$url_get_contents_data = false; $url_get_contents_data = false;
} }

View File

@ -1615,30 +1615,6 @@ class common {
if ($this->getData(['core', 'dataVersion']) < 10405) { if ($this->getData(['core', 'dataVersion']) < 10405) {
$this->setData(['core', 'dataVersion', 10405]); $this->setData(['core', 'dataVersion', 10405]);
} }
// Version 11.0.00
if ($this->getData(['core', 'dataVersion']) < 11000) {
// Option de déconnexion auto activée
$this->setData(['config','autoDisconnect',true]);
// Mettre à jour les données de langue
$this->setData(['config','translate','scriptGoogle', false ]);
$this->setData(['config','translate','showCredits', false ]);
$this->setData(['config','translate','autoDetect', false ]);
$this->setData(['config','translate','admin', false ]);
$this->setData(['config','translate','fr', false ]);
$this->setData(['config','translate','de', false ]);
$this->setData(['config','translate','en', false ]);
$this->setData(['config','translate','es', false ]);
$this->setData(['config','translate','it', false ]);
$this->setData(['config','translate','nl', false ]);
$this->setData(['config','translate','pt', false ]);
$this->setData(['core', 'dataVersion', 11000]);
}
} }
} }