moved update message from its own file (conf/msg) into doku.php (FS#1800)
This commit is contained in:
parent
4691241902
commit
ef362bb863
8
conf/msg
8
conf/msg
|
@ -1,8 +0,0 @@
|
|||
25
|
||||
The first line of this file contains a number, indicating
|
||||
which notification messages should not be displayed. This
|
||||
is the only information sent to dokuwiki.org when the
|
||||
updatecheck option is enabled. You usually don't need to
|
||||
change this number as it gets updated when you install the
|
||||
new release - but to ignore a certain message set its
|
||||
number here.
|
3
doku.php
3
doku.php
|
@ -6,6 +6,9 @@
|
|||
* @author Andreas Gohr <andi@splitbrain.org>
|
||||
*/
|
||||
|
||||
// update message version
|
||||
$updateVersion = 25;
|
||||
|
||||
// xdebug_start_profiling();
|
||||
|
||||
if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
|
||||
|
|
|
@ -16,6 +16,7 @@ if(!defined('DOKU_MESSAGEURL')) define('DOKU_MESSAGEURL','http://update.dokuwiki
|
|||
function checkUpdateMessages(){
|
||||
global $conf;
|
||||
global $INFO;
|
||||
global $updateVersion;
|
||||
if(!$conf['updatecheck']) return;
|
||||
if($conf['useacl'] && !$INFO['ismanager']) return;
|
||||
|
||||
|
@ -23,12 +24,10 @@ function checkUpdateMessages(){
|
|||
$lm = @filemtime($cf);
|
||||
|
||||
// check if new messages needs to be fetched
|
||||
if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_CONF.'msg')){
|
||||
$num = @file(DOKU_CONF.'msg');
|
||||
$num = is_array($num) ? (int) $num[0] : 0;
|
||||
if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_INC.'doku.php')){
|
||||
$http = new DokuHTTPClient();
|
||||
$http->timeout = 8;
|
||||
$data = $http->get(DOKU_MESSAGEURL.$num);
|
||||
$data = $http->get(DOKU_MESSAGEURL.$updateVersion);
|
||||
io_saveFile($cf,$data);
|
||||
}else{
|
||||
$data = io_readFile($cf);
|
||||
|
|
Loading…
Reference in New Issue