* Returnto now works with special pages with subpage parameters

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

diff --git a/includes/Revision.php b/includes/Revision.php
index 7223fcc..71f214e 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -10,8 +10,8 @@ class Revision {
        const DELETED_TEXT = 1;
        const DELETED_COMMENT = 2;
        const DELETED_USER = 4;
-    const DELETED_RESTRICTED = 8;
-       
+       const DELETED_RESTRICTED = 8;
+
        /**
         * Load a page revision from a given revision ID number.
         * Returns null if no such revision can be found.
@@ -281,8 +281,8 @@ class Revision {
                        $this->mMinorEdit = intval( $row->rev_minor_edit );
                        $this->mTimestamp =         $row->rev_timestamp;
                        $this->mDeleted   = intval( $row->rev_deleted );
-
-                       if( is_null( $row->rev_len ) )
+                       
+                       if( !isset( $row->rev_len ) || is_null( $row->rev_len ) )
                                $this->mSize = null;
                        else
                                $this->mSize = intval( $row->rev_len ); 
@@ -611,7 +611,7 @@ class Revision {
                                # Old revisions kept around in a legacy encoding?
                                # Upconvert on demand.
                                global $wgInputEncoding, $wgContLang;
-                               $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding . '//IGNORE', $text );
+                               $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
                        }
                }
                wfProfileOut( $fname );