[MediaWiki-commits] [Gerrit] mediawiki...DataTransfer[master]: Moved PHPExcel check inside Special:ImportSpreadsheet
Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402887 )
Change subject: Moved PHPExcel check inside Special:ImportSpreadsheet
..
Moved PHPExcel check inside Special:ImportSpreadsheet
Change-Id: I9fb63a78d609eaa5784180411c57351517a62019
---
M DataTransfer.php
M specials/DT_ImportSpreadsheet.php
2 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataTransfer.php b/DataTransfer.php
index 0897559..a22930b 100644
--- a/DataTransfer.php
+++ b/DataTransfer.php
@@ -34,7 +34,7 @@
'position' => 'bottom',
);
-// register all special pages and other classes
+// Register all special pages and other classes.
$wgAutoloadClasses['DTPageStructure'] = $dtgIP .
'/includes/DT_PageStructure.php';
$wgAutoloadClasses['DTPageComponent'] = $dtgIP .
'/includes/DT_PageComponent.php';
$wgAutoloadClasses['DTPage'] = $dtgIP . '/includes/DT_Page.php';
@@ -45,19 +45,16 @@
$wgAutoloadClasses['DTImportXML'] = $dtgIP . '/specials/DT_ImportXML.php';
$wgSpecialPages['ImportCSV'] = 'DTImportCSV';
$wgAutoloadClasses['DTImportCSV'] = $dtgIP . '/specials/DT_ImportCSV.php';
+$wgSpecialPages['ImportSpreadsheet'] = 'DTImportSpreadsheet';
+$wgAutoloadClasses['DTImportSpreadsheet'] = $dtgIP .
'/specials/DT_ImportSpreadsheet.php';
$wgJobClasses['dtImport'] = 'DTImportJob';
$wgAutoloadClasses['DTImportJob'] = $dtgIP . '/includes/DT_ImportJob.php';
$wgAutoloadClasses['DTXMLParser'] = $dtgIP . '/includes/DT_XMLParser.php';
$wgAutoloadClasses['DTWikiTemplate'] = $dtgIP .
'/includes/DT_WikiTemplate.php';
$wgAutoloadClasses['DTWikiPage'] = $dtgIP . '/includes/DT_WikiPage.php';
$wgAutoloadClasses['DTHooks'] = $dtgIP . '/includes/DT_Hooks.php';
-$wgHooks['AdminLinks'][] = 'DTHooks::addToAdminLinks';
-// Only enable spreadsheet import if PHPExcel is installed.
-if ( class_exists( 'PHPExcel' )) {
- $wgSpecialPages['ImportSpreadsheet'] = 'DTImportSpreadsheet';
- $wgAutoloadClasses['DTImportSpreadsheet'] = $dtgIP .
'/specials/DT_ImportSpreadsheet.php';
-}
+$wgHooks['AdminLinks'][] = 'DTHooks::addToAdminLinks';
###
# Permission to import files
diff --git a/specials/DT_ImportSpreadsheet.php
b/specials/DT_ImportSpreadsheet.php
index 2fb751c..c1da80a 100644
--- a/specials/DT_ImportSpreadsheet.php
+++ b/specials/DT_ImportSpreadsheet.php
@@ -3,6 +3,7 @@
* Lets the user import a spreadsheet file to turn into wiki pages
*
* @author Stephan Gambke
+ * @ingroup DataTransfer
*/
class DTImportSpreadsheet extends DTImportCSV {
@@ -12,6 +13,10 @@
}
protected function printForm() {
+ if ( !class_exists( 'PHPExcel' ) ) {
+ return 'You must have the PHPExcel
library installed to run this page.';
+ }
+
$formText = DTUtils::printFileSelector( $this->getFiletype() );
$formText .= DTUtils::printExistingPagesHandling();
$formText .= DTUtils::printImportSummaryInput(
$this->getFiletype() );
--
To view, visit https://gerrit.wikimedia.org/r/402887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fb63a78d609eaa5784180411c57351517a62019
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DataTransfer
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DataTransfer[master]: Moved PHPExcel check inside Special:ImportSpreadsheet
Yaron Koren has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402887 )
Change subject: Moved PHPExcel check inside Special:ImportSpreadsheet
..
Moved PHPExcel check inside Special:ImportSpreadsheet
Change-Id: I9fb63a78d609eaa5784180411c57351517a62019
---
M DataTransfer.php
M specials/DT_ImportSpreadsheet.php
2 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataTransfer
refs/changes/87/402887/2
diff --git a/DataTransfer.php b/DataTransfer.php
index 0897559..a22930b 100644
--- a/DataTransfer.php
+++ b/DataTransfer.php
@@ -34,7 +34,7 @@
'position' => 'bottom',
);
-// register all special pages and other classes
+// Register all special pages and other classes.
$wgAutoloadClasses['DTPageStructure'] = $dtgIP .
'/includes/DT_PageStructure.php';
$wgAutoloadClasses['DTPageComponent'] = $dtgIP .
'/includes/DT_PageComponent.php';
$wgAutoloadClasses['DTPage'] = $dtgIP . '/includes/DT_Page.php';
@@ -45,19 +45,16 @@
$wgAutoloadClasses['DTImportXML'] = $dtgIP . '/specials/DT_ImportXML.php';
$wgSpecialPages['ImportCSV'] = 'DTImportCSV';
$wgAutoloadClasses['DTImportCSV'] = $dtgIP . '/specials/DT_ImportCSV.php';
+$wgSpecialPages['ImportSpreadsheet'] = 'DTImportSpreadsheet';
+$wgAutoloadClasses['DTImportSpreadsheet'] = $dtgIP .
'/specials/DT_ImportSpreadsheet.php';
$wgJobClasses['dtImport'] = 'DTImportJob';
$wgAutoloadClasses['DTImportJob'] = $dtgIP . '/includes/DT_ImportJob.php';
$wgAutoloadClasses['DTXMLParser'] = $dtgIP . '/includes/DT_XMLParser.php';
$wgAutoloadClasses['DTWikiTemplate'] = $dtgIP .
'/includes/DT_WikiTemplate.php';
$wgAutoloadClasses['DTWikiPage'] = $dtgIP . '/includes/DT_WikiPage.php';
$wgAutoloadClasses['DTHooks'] = $dtgIP . '/includes/DT_Hooks.php';
-$wgHooks['AdminLinks'][] = 'DTHooks::addToAdminLinks';
-// Only enable spreadsheet import if PHPExcel is installed.
-if ( class_exists( 'PHPExcel' )) {
- $wgSpecialPages['ImportSpreadsheet'] = 'DTImportSpreadsheet';
- $wgAutoloadClasses['DTImportSpreadsheet'] = $dtgIP .
'/specials/DT_ImportSpreadsheet.php';
-}
+$wgHooks['AdminLinks'][] = 'DTHooks::addToAdminLinks';
###
# Permission to import files
diff --git a/specials/DT_ImportSpreadsheet.php
b/specials/DT_ImportSpreadsheet.php
index 2fb751c..c1da80a 100644
--- a/specials/DT_ImportSpreadsheet.php
+++ b/specials/DT_ImportSpreadsheet.php
@@ -3,6 +3,7 @@
* Lets the user import a spreadsheet file to turn into wiki pages
*
* @author Stephan Gambke
+ * @ingroup DataTransfer
*/
class DTImportSpreadsheet extends DTImportCSV {
@@ -12,6 +13,10 @@
}
protected function printForm() {
+ if ( !class_exists( 'PHPExcel' ) ) {
+ return 'You must have the PHPExcel
library installed to run this page.';
+ }
+
$formText = DTUtils::printFileSelector( $this->getFiletype() );
$formText .= DTUtils::printExistingPagesHandling();
$formText .= DTUtils::printImportSummaryInput(
$this->getFiletype() );
--
To view, visit https://gerrit.wikimedia.org/r/402887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fb63a78d609eaa5784180411c57351517a62019
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DataTransfer
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
