catrope

Index: api/ApiArticleFeedback.php
===================================================================
--- api/ApiArticleFeedback.php	(revision 96655)
+++ api/ApiArticleFeedback.php	(working copy)
@@ -164,6 +164,13 @@
 	 */
 	private function insertRevisionRating( $pageId, $revisionId, $lastRevision, $ratingId, $updateAddition, $thisRating, $lastRating ) {
 		$dbw = wfGetDB( DB_MASTER );
+		
+		// Fix previous logic bug: if the revision IDs of the previous and current ratings are NOT the same,

catrope

Index: skins/monobook/IE60Fixes.css
===================================================================
--- skins/monobook/IE60Fixes.css        (revision 97651)
+++ skins/monobook/IE60Fixes.css        (working copy)
@@ -11,16 +11,30 @@
        margin-top: 3em;
        height: 1%;
 }
+.rtl div#column-content div#content {
+       margin-right: 12.2em;

catrope

Index: languages/messages/MessagesEn.php
===================================================================
--- languages/messages/MessagesEn.php   (revision 97909)
+++ languages/messages/MessagesEn.php   (working copy)
@@ -3656,10 +3656,15 @@
 
 # Video information, used by Language::formatTimePeriod() to format lengths in the above messages
 'video-dims'     => '$1, $2×$3', # only translate this message to other languages if you have to change it
-'seconds-abbrev' => 's', # only translate this message to other languages if you have to change it
-'minutes-abbrev' => 'm', # only translate this message to other languages if you have to change it

catrope

Index: includes/HistoryBlob.php
===================================================================
--- includes/HistoryBlob.php    (revision 98216)
+++ includes/HistoryBlob.php    (working copy)
@@ -516,13 +516,17 @@
                $header = unpack( 'Vofp/Vcsize', substr( $diff, 0, 8 ) );
 
                # Check the checksum if mhash is available
+               # TEMPORARY WMF PATCH -- temporarily disable hash check, since a large number of 
+               # revisions appear to have hash mismatches

catrope

Index: includes/parser/ParserCache.php
===================================================================
--- includes/parser/ParserCache.php     (revision 98303)
+++ includes/parser/ParserCache.php     (working copy)
@@ -50,7 +50,7 @@
 
                // idhash seem to mean 'page id' + 'rendering hash' (r3710)
                $pageid = $article->getID();
-               $renderkey = (int)($wgRequest->getVal('action') == 'render');
+               $renderkey = (int)($wgRequest->getVal('action') == 'render') + 2*(int)($wgRequest->getVal('action') == 'parse');

catrope

/* Output (copypaste to Firebug to view):
{"data":[{"type":"document","node":null},{"type":"heading","attributes":{"level":1},"node":null},"T","h","i","s"," ","i","s"," ","a"," ",["h",{"type":"italic"}],["e",{"type":"italic"}],["a",{"type":"italic"}],["d",{"type":"italic"}],["i",{"type":"italic"}],["n",{"type":"italic"}],["g",{"type":"italic"}]," ","(","l","e","v","e","l"," ","1",")",{"type":"/heading","node":null},{"type":"heading","attributes":{"level":2},"node":null},"T","h","i","s"," ","i","s"," ","a"," ",["h",{"type":"italic"}],["e",{"type":"italic"}],["a",{"type":"italic"}],["d",{"type":"italic"}],["i",{"type":"italic"}],["n",{"type":"italic"}],["g",{"type":"italic"}]," ","(","l","e","v","e","l"," ","2",")",{"type":"/heading","node":null},{"type":"heading","attributes":{"level":3},"node":null},"T","h","i","s"," ","i","s"," ","a"," ",["h",{"type":"italic"}],["e",{"type":"italic"}],["a",{"type":"italic"}],["d",{"type":"italic"}],["i",{"type":"italic"}],["n",{"type":"italic"}],["g",{"type":"italic"}]," ","

catrope

/**
 * Gets a list of nodes and their sub-ranges which are covered by a given range.
 * 
 * @method
 * @param {es.Range} range Range to select nodes within
 * @returns {Array} List of objects with 'node' and 'range' properties describing nodes which are
 * covered by the range and the range within the node that is covered
 */
es.DocumentNode.prototype.selectNodes = function( range ) {
	var nodes = [], i, left, right, start, end, startInside, endInside;

catrope

[2013-04-03 22:31:43 PDT] catrope@roanS9:~$ cat crash.js 
  var a = {};
  a.b = a;
  alert( JSON.stringify( a, function ( key, val ) {
  	// This technically needs an if statement to check that val is an object or array,
  	// but for this test it doesn't matter
  	var normalized = {}, keys = Object.keys( val ).sort(), i = 0, len = keys.length;
  	for ( ; i < len; i++ ) {
  		normalized[keys[i]] = val[keys[i]];
  	}

catrope

diff --git a/src/qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp b/src/qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
index 27a508a..daeb4e9 100644
--- a/src/qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
+++ b/src/qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
@@ -370,6 +370,7 @@ inline JSValue Stringifier::toJSON(JSValue value, const PropertyNameForFunctionC
 
 Stringifier::StringifyResult Stringifier::appendStringifiedValue(UStringBuilder& builder, JSValue value, JSObject* holder, const PropertyNameForFunctionCall& propertyNa
 {
+    JSValue oldValue = value;
     // Call the toJSON function.

catrope

/*!
 * VisualEditor DataModel MWEntityNode class.
 *
 * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
 * @license The MIT License (MIT); see LICENSE.txt
 */

/**
 * DataModel MediaWiki image node.
 *