Tomg, please test with error_reporting set to E_ALL or we will beat you up!

* Set default value for $this->scrolltop
* Use proper function to get an integer or empty value, instead of bizarre
HTML-escape-random-junk-on-input

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f873041..87aa4d7 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -29,7 +29,7 @@ class EditPage {
        var $minoredit = false, $watchthis = false, $recreate = false;
        var $textbox1 = '', $textbox2 = '', $summary = '';
        var $edittime = '', $section = '', $starttime = '';
-       var $oldid = 0, $editintro = '';
+       var $oldid = 0, $editintro = '', $scrolltop = null;
 
        /**
         * @todo document
@@ -319,7 +319,7 @@ class EditPage {
                        $this->edittime = $request->getVal( 'wpEdittime' );
                        $this->starttime = $request->getVal( 'wpStarttime' );
 
-                       $this->scrolltop = htmlentities( $request->getVal( 'wpScrolltop' ) );
+                       $this->scrolltop = $request->getIntOrNull( 'wpScrolltop' );
 
                        if( is_null( $this->edittime ) ) {
                                # If the form is incomplete, force to preview.