From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Wed, 14 Sep 2011 07:47:32 +0000 (+0000)
Subject: Drop JSON support. It was never used and causes problems like bug 30854 since PHP... 
X-Git-Tag: 1.31.0-rc.0~27683
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=4a24c0ba53f532bed67b819b84b9d9a59d63e71f;p=lhc%2Fweb%2Fwiklou.git

Drop JSON support. It was never used and causes problems like bug 30854 since PHP managed to screw up json_decode too.
It was not a good idea to autodetection of the format anyway, but it isn't such a problem with unserialize.
---

diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 315a0ca745..7fd268ec28 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -210,14 +210,8 @@ class DatabaseLogEntry extends LogEntryBase {
 				$this->params = $params;
 				$this->legacy = false;
 			} else {
-				$params = FormatJson::decode( $blob, true /* array */ );
-				if ( $params !== null ) {
-					$this->params = $params;
-					$this->legacy = false;
-				} else {
-					$this->params = $blob === '' ? array() : explode( "\n", $blob );
-					$this->legacy = true;
-				}
+				$this->params = $blob === '' ? array() : explode( "\n", $blob );
+				$this->legacy = true;
 			}
 		}
 		return $this->params;