Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87513
Change subject: Rename UploadWizardCampaign class to Campaign
......................................................................
Rename UploadWizardCampaign class to Campaign
Too Long without any obvious benefits
Change-Id: I7fa3e6638951071564635156a267e240842ce416
---
M UploadWizard.php
M includes/ApiQueryAllCampaigns.php
R includes/Campaign.php
M includes/CampaignContent.php
M includes/CampaignHooks.php
M includes/UploadWizardConfig.php
M includes/specials/SpecialUploadWizard.php
7 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/13/87513/1
diff --git a/UploadWizard.php b/UploadWizard.php
index 320974e..c6e3e41 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -56,7 +56,7 @@
// Includes
'UploadWizardConfig' => $wgUpwizDir .
'/includes/UploadWizardConfig.php',
'UploadWizardTutorial' => $wgUpwizDir .
'/includes/UploadWizardTutorial.php',
- 'UploadWizardCampaign' => $wgUpwizDir .
'/includes/UploadWizardCampaign.php',
+ 'Campaign' => $wgUpwizDir . '/includes/Campaign.php',
// Campaign ContentHandler
'CampaignContentHandler' => $wgUpwizDir .
'/includes/CampaignContentHandler.php',
diff --git a/includes/ApiQueryAllCampaigns.php
b/includes/ApiQueryAllCampaigns.php
index 3e3211b..197d8db 100644
--- a/includes/ApiQueryAllCampaigns.php
+++ b/includes/ApiQueryAllCampaigns.php
@@ -70,7 +70,7 @@
break;
}
- $campaign = UploadWizardCampaign::newFromName(
$row->campaign_name );
+ $campaign = Campaign::newFromName( $row->campaign_name
);
$campaignPath = array( 'query', $this->getModuleName(),
$row->campaign_id );
diff --git a/includes/UploadWizardCampaign.php b/includes/Campaign.php
similarity index 98%
rename from includes/UploadWizardCampaign.php
rename to includes/Campaign.php
index 89aa761..8cc8c41 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/Campaign.php
@@ -17,7 +17,7 @@
* @author Yuvi Panda <[email protected]>
* @author Jeroen De Dauw < [email protected] >
*/
-class UploadWizardCampaign {
+class Campaign {
/**
* The campaign configuration.
@@ -67,7 +67,7 @@
return false;
}
- return new UploadWizardCampaign( $campaignTitle );
+ return new Campaign( $campaignTitle );
}
function __construct( $title, $config = null, $context = null ) {
diff --git a/includes/CampaignContent.php b/includes/CampaignContent.php
index d75b9d9..f2772be 100644
--- a/includes/CampaignContent.php
+++ b/includes/CampaignContent.php
@@ -102,7 +102,7 @@
function generateHtml( $title ) {
wfProfileIn( __METHOD__ );
- $campaign = new UploadWizardCampaign( $title,
$this->getJsonData() );
+ $campaign = new Campaign( $title, $this->getJsonData() );
$formatter = new CampaignPageFormatter( $campaign );
return $formatter->generateReadHtml();
diff --git a/includes/CampaignHooks.php b/includes/CampaignHooks.php
index c309b0d..41c963d 100644
--- a/includes/CampaignHooks.php
+++ b/includes/CampaignHooks.php
@@ -37,7 +37,7 @@
);
- $campaign = new UploadWizardCampaign( $article->getTitle(),
$content->getJsonData() );
+ $campaign = new Campaign( $article->getTitle(),
$content->getJsonData() );
// Track the templates being used in the wikitext in this
campaign, and add the campaign page
// as a dependency on those templates, via the templatelinks
table. This triggers an update
@@ -78,7 +78,7 @@
return true;
}
- $campaign = new UploadWizardCampaign( $linksupdate->getTitle()
);
+ $campaign = new Campaign( $linksupdate->getTitle() );
$campaign->invalidateCache();
return true;
diff --git a/includes/UploadWizardConfig.php b/includes/UploadWizardConfig.php
index 5ab9961..da5353e 100644
--- a/includes/UploadWizardConfig.php
+++ b/includes/UploadWizardConfig.php
@@ -144,7 +144,7 @@
*/
protected static function getCampaignConfig( $campaignName ) {
if ( !is_null( $campaignName ) ) {
- $campaign = UploadWizardCampaign::newFromName(
$campaignName );
+ $campaign = Campaign::newFromName( $campaignName );
if ( $campaign !== false && $campaign->getIsEnabled() )
{
return $campaign->getParsedConfig();
diff --git a/includes/specials/SpecialUploadWizard.php
b/includes/specials/SpecialUploadWizard.php
index 2778bdb..0b9b27b 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -132,7 +132,7 @@
$campaignName = $this->getRequest()->getVal( 'campaign' );
if ( !is_null( $campaignName ) && $campaignName !== '' ) {
- $campaign = UploadWizardCampaign::newFromName(
$campaignName );
+ $campaign = Campaign::newFromName( $campaignName );
if ( $campaign === false ) {
$this->displayError( $this->msg(
'mwe-upwiz-error-nosuchcampaign', $campaignName )->text() );
--
To view, visit https://gerrit.wikimedia.org/r/87513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fa3e6638951071564635156a267e240842ce416
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
