jenkins-bot has submitted this change and it was merged.
Change subject: Use __DIR__ instead of dirname( __FILE__ )
......................................................................
Use __DIR__ instead of dirname( __FILE__ )
Change-Id: I6bb8b5de55d26ea321e52fdb6d204aa537171202
---
M UploadWizardHooks.php
M maintenance/migrateCampaigns.php
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index 929dff6..c939104 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -766,23 +766,23 @@
* @return true
*/
public static function onSchemaUpdate( /* DatabaseUpdater */ $updater =
null ) {
- $dbfile = dirname( __FILE__ ) . '/UploadWizard.' .
$updater->getDB()->getType() . '.sql';
+ $dbfile = __DIR__ . '/UploadWizard.' .
$updater->getDB()->getType() . '.sql';
if ( !file_exists( $dbfile ) ) {
- $dbfile = dirname( __FILE__ ) . '/UploadWizard.sql';
+ $dbfile = __DIR__ . '/UploadWizard.sql';
}
$updater->addExtensionTable( 'uw_campaigns', $dbfile );
$updater->addExtensionUpdate( array(
'addIndex',
'uw_campaigns',
'uw_campaigns_name',
- dirname( __FILE__ ) . '/sql/UW_IndexCampaignsName.sql',
+ __DIR__ . '/sql/UW_IndexCampaignsName.sql',
true
) );
$updater->addExtensionUpdate( array(
'addIndex',
'uw_campaigns',
'uw_campaigns_enabled',
- dirname( __FILE__ ) .
'/sql/UW_IndexCampaignsEnabled.sql',
+ __DIR__ . '/sql/UW_IndexCampaignsEnabled.sql',
true
) );
diff --git a/maintenance/migrateCampaigns.php b/maintenance/migrateCampaigns.php
index 02b6ee1..9c34705 100644
--- a/maintenance/migrateCampaigns.php
+++ b/maintenance/migrateCampaigns.php
@@ -28,7 +28,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../..';
+ $IP = __DIR__ . '/../../..';
}
require_once "$IP/maintenance/Maintenance.php";
--
To view, visit https://gerrit.wikimedia.org/r/248858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bb8b5de55d26ea321e52fdb6d204aa537171202
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
