[MediaWiki-commits] [Gerrit] Make fetching the newest version work again - change (mediawiki...UpdateMediaWiki)
jenkins-bot has submitted this change and it was merged. Change subject: Make fetching the newest version work again .. Make fetching the newest version work again Change-Id: Idfba7b56c0854c660f3d9c3e0987d0e6ac0a0e89 --- M i18n/en.json M i18n/es.json M specialupdatemediawiki.php 3 files changed, 61 insertions(+), 61 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index dd05680..fde5570 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6,9 +6,9 @@ }, "updatemediawiki": "Update MediaWiki", "updatemediawiki-desc": "Allows updating MediaWiki via a special page", - "updatemediawiki-current": "Current version", + "updatemediawiki-current": "Current version $1", "updatemediawiki-update-nofound": "No update is available", - "updatemediawiki-update-found": "New update found", + "updatemediawiki-update-found": "New update found: $1", "updatemediawiki-update-downloading": "Downloading new update", "updatemediawiki-update-saved": "Update downloaded and saved", "updatemediawiki-update-exist": "Update already downloaded", diff --git a/i18n/es.json b/i18n/es.json index 8b1d820..18e549c 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -6,9 +6,9 @@ }, "updatemediawiki": "Actualizar MediaWiki", "updatemediawiki-desc": "Permite a los administradores y usuarios autorizados actualizar MediaWiki desde una página especial.", - "updatemediawiki-current": "Versión Actual", + "updatemediawiki-current": "Versión Actual $1", "updatemediawiki-update-nofound": "No hay actualizaciones disponibles", - "updatemediawiki-update-found": "Nueva actualización encontrada", + "updatemediawiki-update-found": "Nueva actualización encontrada: $1", "updatemediawiki-update-downloading": "Descargando nueva actualización", "updatemediawiki-update-saved": "Nueva actualización descargada y guardada", "updatemediawiki-update-exist": "La actualización ya se había descargado", diff --git a/specialupdatemediawiki.php b/specialupdatemediawiki.php index 00050b0..a96f00e 100644 --- a/specialupdatemediawiki.php +++ b/specialupdatemediawiki.php @@ -10,12 +10,12 @@ **/ class Specialupdatemediawiki extends SpecialPage { + function __construct() { - parent::__construct( $name = 'updatemediawiki', $restriction = 'updatecore' ); + parent::__construct( 'updatemediawiki', 'updatecore' ); } function execute( $par ) { - // ... if ( !$this->userCanExecute( $this->getUser() ) ) { $this->displayRestrictionError(); @@ -26,76 +26,76 @@ $output = $this->getOutput(); $this->setHeaders(); - $param = $request->getText( 'param' ); - global $wgVersion, $IP; - $getVersions = substr(file_get_contents('https://www.mediawiki.org/w/index.php?title=Template:MW_stable_release_number=raw'), 0, 6) or die ('ERROR'); - if ($getVersions != '') { + $getVersion = json_decode( file_get_contents( 'https://www.mediawiki.org/w/api.php?action=parse=json=%7B%7B%23invoke%3AVersion%7Cget%7Cstable%7Cversion%7D%7D=text=1=1=1=1=wikitext' ), true ) or die ( 'ERROR' ); + $aV = $getVersion["parse"]["text"]["*"]; + $updated = false; + $found = false; + if ( !empty( $aV ) ) { //If we managed to access that file, then lets break up those release versions into an array. - $output->addWikiText( "== ". wfMessage( 'updatemediawiki-current' )->text() ." ".$wgVersion." == " ); - $versionList = explode("\\n", $getVersions); - $mainVersion = substr($getVersions, 0, 4); - foreach ( $versionList as $aV ) { - if ( $aV > $wgVersion ) { - $output->addWikiText( "".wfMessage( 'updatemediawiki-update-found' )->text()."v".$aV."" ); - $found = true; -//Download The File If We Do Not Have It - if ( !is_file( __DIR__ . '/Updates/mediawiki-'.$aV.'.tar.gz' ) ) { - $output->addWikiText( "".wfMessage( 'updatemediawiki-update-downloading' )->text()."" ); - $newUpdate = file_get_contents('http://download.wikimedia.org/mediawiki/'.$mainVersion.'/mediawiki-'.$aV.'.tar.gz'); - if ( !is_dir( __DIR__ . '/Updates' ) ) { -
[MediaWiki-commits] [Gerrit] Make fetching the newest version work again - change (mediawiki...UpdateMediaWiki)
Matěj Suchánek has uploaded a new change for review. https://gerrit.wikimedia.org/r/291495 Change subject: Make fetching the newest version work again .. Make fetching the newest version work again Change-Id: Idfba7b56c0854c660f3d9c3e0987d0e6ac0a0e89 --- M i18n/en.json M i18n/es.json M specialupdatemediawiki.php 3 files changed, 61 insertions(+), 61 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UpdateMediaWiki refs/changes/95/291495/1 diff --git a/i18n/en.json b/i18n/en.json index dd05680..fde5570 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6,9 +6,9 @@ }, "updatemediawiki": "Update MediaWiki", "updatemediawiki-desc": "Allows updating MediaWiki via a special page", - "updatemediawiki-current": "Current version", + "updatemediawiki-current": "Current version $1", "updatemediawiki-update-nofound": "No update is available", - "updatemediawiki-update-found": "New update found", + "updatemediawiki-update-found": "New update found: $1", "updatemediawiki-update-downloading": "Downloading new update", "updatemediawiki-update-saved": "Update downloaded and saved", "updatemediawiki-update-exist": "Update already downloaded", diff --git a/i18n/es.json b/i18n/es.json index 8b1d820..18e549c 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -6,9 +6,9 @@ }, "updatemediawiki": "Actualizar MediaWiki", "updatemediawiki-desc": "Permite a los administradores y usuarios autorizados actualizar MediaWiki desde una página especial.", - "updatemediawiki-current": "Versión Actual", + "updatemediawiki-current": "Versión Actual $1", "updatemediawiki-update-nofound": "No hay actualizaciones disponibles", - "updatemediawiki-update-found": "Nueva actualización encontrada", + "updatemediawiki-update-found": "Nueva actualización encontrada: $1", "updatemediawiki-update-downloading": "Descargando nueva actualización", "updatemediawiki-update-saved": "Nueva actualización descargada y guardada", "updatemediawiki-update-exist": "La actualización ya se había descargado", diff --git a/specialupdatemediawiki.php b/specialupdatemediawiki.php index 00050b0..aef8898 100644 --- a/specialupdatemediawiki.php +++ b/specialupdatemediawiki.php @@ -10,12 +10,12 @@ **/ class Specialupdatemediawiki extends SpecialPage { + function __construct() { - parent::__construct( $name = 'updatemediawiki', $restriction = 'updatecore' ); + parent::__construct( 'updatemediawiki', 'updatecore' ); } function execute( $par ) { - // ... if ( !$this->userCanExecute( $this->getUser() ) ) { $this->displayRestrictionError(); @@ -26,76 +26,76 @@ $output = $this->getOutput(); $this->setHeaders(); - $param = $request->getText( 'param' ); - global $wgVersion, $IP; - $getVersions = substr(file_get_contents('https://www.mediawiki.org/w/index.php?title=Template:MW_stable_release_number=raw'), 0, 6) or die ('ERROR'); - if ($getVersions != '') { + $getVersion = json_decode( file_get_contents( 'https://www.mediawiki.org/w/api.php?action=parse=json=%7B%7B%23invoke%3AVersion%7Cget%7Cstable%7Cversion%7D%7D=text=1=1=1=1=wikitext' ), true ) or die ( 'ERROR' ); + $aV = $getVersion["parse"]["text"]["*"]; + $updated = false; + $found = false; + if ( !empty( $aV ) ) { //If we managed to access that file, then lets break up those release versions into an array. - $output->addWikiText( "== ". wfMessage( 'updatemediawiki-current' )->text() ." ".$wgVersion." == " ); - $versionList = explode("\\n", $getVersions); - $mainVersion = substr($getVersions, 0, 4); - foreach ( $versionList as $aV ) { - if ( $aV > $wgVersion ) { - $output->addWikiText( "".wfMessage( 'updatemediawiki-update-found' )->text()."v".$aV."" ); - $found = true; -//Download The File If We Do Not Have It - if ( !is_file( __DIR__ . '/Updates/mediawiki-'.$aV.'.tar.gz' ) ) { - $output->addWikiText( "".wfMessage( 'updatemediawiki-update-downloading' )->text()."" ); - $newUpdate = file_get_contents('http://download.wikimedia.org/mediawiki/'.$mainVersion.'/mediawiki-'.$aV.'.tar.gz'); - if (