From 4a24c0ba53f532bed67b819b84b9d9a59d63e71f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 14 Sep 2011 07:47:32 +0000 Subject: [PATCH] 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. --- includes/logging/LogEntry.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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; -- 2.20.1