r94543 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94542‎ | r94543 | r94544 >
Date:18:35, 15 August 2011
Author:reedy
Status:ok (Comments)
Tags:
Comment:
Partial revert to r87584

To fix bug bug 30355 importImages.php Internal Error
Modified paths:
  • /trunk/phase3/includes/filerepo/LocalFile.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/filerepo/LocalFile.php
@@ -863,6 +863,25 @@
864864 /**
865865 * Record a file upload in the upload log and the image table
866866 */
 867+ function recordUpload( $oldver, $desc, $license = '', $copyStatus = '', $source = '',
 868+ $watch = false, $timestamp = false )
 869+ {
 870+ $pageText = SpecialUpload::getInitialPageText( $desc, $license, $copyStatus, $source );
 871+
 872+ if ( !$this->recordUpload2( $oldver, $desc, $pageText ) ) {
 873+ return false;
 874+ }
 875+
 876+ if ( $watch ) {
 877+ global $wgUser;
 878+ $wgUser->addWatch( $this->getTitle() );
 879+ }
 880+ return true;
 881+ }
 882+
 883+ /**
 884+ * Record a file upload in the upload log and the image table
 885+ */
867886 function recordUpload2(
868887 $oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null
869888 ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r94585MFT r94543 -- fix bug 30355 (importImages regression from r87584)brion22:39, 15 August 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r87584More versions added to @deprecated tags...reedy21:50, 6 May 2011

Comments

#Comment by Brion VIBBER (talk | contribs)   21:57, 15 August 2011

Confirmed this resolves bug 30355.

#Comment by Brion VIBBER (talk | contribs)   22:40, 15 August 2011

Merged to 1.18 as r94585

Status & tagging log