Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/97512
Change subject: Break long lines in job related files
......................................................................
Break long lines in job related files
Change-Id: I827773efd59dcf5789abcaa025cc0a9184eb7fac
---
M includes/job/jobs/AssembleUploadChunksJob.php
M includes/job/jobs/DoubleRedirectJob.php
M includes/job/jobs/PublishStashedFileJob.php
3 files changed, 18 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/12/97512/1
diff --git a/includes/job/jobs/AssembleUploadChunksJob.php
b/includes/job/jobs/AssembleUploadChunksJob.php
index fb5fb58..eff16b9 100644
--- a/includes/job/jobs/AssembleUploadChunksJob.php
+++ b/includes/job/jobs/AssembleUploadChunksJob.php
@@ -48,7 +48,8 @@
// with the session correctly. Note that being
able to load
// the user does not necessarily mean the
session was loaded.
// Most likely cause by suhosin.session.encrypt
= On.
- $this->setLastError( "Error associating with
user session. Try setting suhosin.session.encrypt = Off" );
+ $this->setLastError( "Error associating with
user session. " .
+ "Try setting suhosin.session.encrypt =
Off" );
return false;
}
diff --git a/includes/job/jobs/DoubleRedirectJob.php
b/includes/job/jobs/DoubleRedirectJob.php
index 991b2eb..ab8aef9 100644
--- a/includes/job/jobs/DoubleRedirectJob.php
+++ b/includes/job/jobs/DoubleRedirectJob.php
@@ -36,8 +36,10 @@
/**
* Insert jobs into the job queue to fix redirects to the given title
- * @param string $reason the reason for the fix, see message
"double-redirect-fixed-<reason>"
- * @param $redirTitle Title: the title which has changed, redirects
pointing to this title are fixed
+ * @param string $reason the reason for the fix, see message
+ * "double-redirect-fixed-<reason>"
+ * @param $redirTitle Title: the title which has changed, redirects
+ * pointing to this title are fixed
* @param bool $destTitle Not used
*/
public static function fixRedirects( $reason, $redirTitle, $destTitle =
false ) {
@@ -114,7 +116,8 @@
// Find the current final destination
$newTitle = self::getFinalDestination( $this->redirTitle );
if ( !$newTitle ) {
- wfDebug( __METHOD__ . ": skipping: single redirect,
circular redirect or invalid redirect destination\n" );
+ wfDebug( __METHOD__ .
+ ": skipping: single redirect, circular redirect
or invalid redirect destination\n" );
return true;
}
@@ -203,7 +206,12 @@
# No redirect from here, chain terminates
break;
} else {
- $dest = $title = Title::makeTitle(
$row->rd_namespace, $row->rd_title, '', $row->rd_interwiki );
+ $dest = $title = Title::makeTitle(
+ $row->rd_namespace,
+ $row->rd_title,
+ '',
+ $row->rd_interwiki
+ );
}
}
@@ -219,7 +227,8 @@
*/
function getUser() {
if ( !self::$user ) {
- self::$user = User::newFromName( wfMessage(
'double-redirect-fixer' )->inContentLanguage()->text() );
+ $username = wfMessage( 'double-redirect-fixer'
)->inContentLanguage()->text();
+ self::$user = User::newFromName( $username );
# User::newFromName() can return false on a badly
configured wiki.
if ( self::$user && !self::$user->isLoggedIn() ) {
self::$user->addToDatabase();
diff --git a/includes/job/jobs/PublishStashedFileJob.php
b/includes/job/jobs/PublishStashedFileJob.php
index ba47cb9..88ac9cf 100644
--- a/includes/job/jobs/PublishStashedFileJob.php
+++ b/includes/job/jobs/PublishStashedFileJob.php
@@ -48,7 +48,8 @@
// with the session correctly. Note that being
able to load
// the user does not necessarily mean the
session was loaded.
// Most likely cause by suhosin.session.encrypt
= On.
- $this->setLastError( "Error associating with
user session. Try setting suhosin.session.encrypt = Off" );
+ $this->setLastError( "Error associating with
user session. " .
+ "Try setting suhosin.session.encrypt =
Off" );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/97512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I827773efd59dcf5789abcaa025cc0a9184eb7fac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
