r90772 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r90771‎ | r90772 | r90773 >
Date:16:15, 25 June 2011
Author:reedy
Status:ok
Tags:
Comment:
Uncommited documentation from my working copy
Modified paths:
  • /trunk/phase3/includes/Export.php (modified) (history)
  • /trunk/phase3/includes/filerepo/File.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Export.php
@@ -438,12 +438,13 @@
439439 /**
440440 * Closes the output stream with the closing root element.
441441 * Call when finished dumping things.
 442+ *
 443+ * @return string
442444 */
443445 function closeStream() {
444446 return "</mediawiki>\n";
445447 }
446448
447 -
448449 /**
449450 * Opens a <page> section on the output stream, with data
450451 * from the given database row.
@@ -616,6 +617,11 @@
617618 return '';
618619 }
619620
 621+ /**
 622+ * @param $file File
 623+ * @param $dumpContents bool
 624+ * @return string
 625+ */
620626 function writeUpload( $file, $dumpContents = false ) {
621627 if ( $file->isOld() ) {
622628 $archiveName = " " .
Index: trunk/phase3/includes/filerepo/File.php
@@ -1431,8 +1431,10 @@
14321432 * 160 log 2 / log 36 = 30.95, so the 160-bit hash fills 31 digits in base 36
14331433 * fairly neatly.
14341434 *
1435 - * Returns false on failure
 1435+ * @param $path string
14361436 *
 1437+ * @return false on failure
 1438+ *
14371439 * @param $path string
14381440 *
14391441 * @return false|string

Follow-up revisions

RevisionCommit summaryAuthorDate
r90774Followup r90722, seems the file comments were a bad merge...reedy16:32, 25 June 2011

Status & tagging log