Merge "Protected function UploadBase->validateName changed to public"

[lhc/web/wiklou.git] / includes / Revision.php

diff --git a/includes/Revision.php b/includes/Revision.php
index dd41565..18cd94e 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -383,7 +383,7 @@ class Revision implements IDBAccessObject {
        }
 
        /**
-        * Return the value of a select() page conds array for the paeg table.
+        * Return the value of a select() page conds array for the page table.
         * This will assure that the revision(s) are not orphaned from live pages.
         * @since 1.19
         * @return Array
@@ -888,7 +888,7 @@ class Revision implements IDBAccessObject {
        }
 
        /**
-        * @param $field int one of DELETED_* bitfield constants
+        * @param int $field one of DELETED_* bitfield constants
         *
         * @return Boolean
         */
@@ -1152,8 +1152,8 @@ class Revision implements IDBAccessObject {
          * field must be included
          *
          * @param $row Object: the text data
-         * @param $prefix String: table prefix (default 'old_')
-         * @param $wiki String|false: the name of the wiki to load the revision text from
+         * @param string $prefix table prefix (default 'old_')
+         * @param string|false $wiki the name of the wiki to load the revision text from
          *         (same as the the wiki $row was loaded from) or false to indicate the local
          *         wiki (this is the default). Otherwise, it must be a symbolic wiki database
          *         identifier as understood by the LoadBalancer class.
@@ -1340,8 +1340,8 @@ class Revision implements IDBAccessObject {
                        $defaultModel = ContentHandler::getDefaultModelFor( $title );
                        $defaultFormat = ContentHandler::getForModelID( $defaultModel )->getDefaultFormat();
 
-                       $row[ 'rev_content_model' ] = ( $model === $defaultModel ) ? null : $model;
-                       $row[ 'rev_content_format' ] = ( $format === $defaultFormat ) ? null : $format;
+                       $row['rev_content_model'] = ( $model === $defaultModel ) ? null : $model;
+                       $row['rev_content_format'] = ( $format === $defaultFormat ) ? null : $format;
                }
 
                $dbw->insert( 'revision', $row, __METHOD__ );
@@ -1479,7 +1479,7 @@ class Revision implements IDBAccessObject {
         *
         * @param $dbw DatabaseBase
         * @param $pageId Integer: ID number of the page to read from
-        * @param $summary String: revision's summary
+        * @param string $summary revision's summary
         * @param $minor Boolean: whether the revision should be considered as minor
         * @return Revision|null on error
         */
@@ -1517,8 +1517,8 @@ class Revision implements IDBAccessObject {
                        );
 
                        if ( $wgContentHandlerUseDB ) {
-                               $row[ 'content_model' ] = $current->rev_content_model;
-                               $row[ 'content_format' ] = $current->rev_content_format;
+                               $row['content_model'] = $current->rev_content_model;
+                               $row['content_format'] = $current->rev_content_format;
                        }
 
                        $revision = new Revision( $row );