r97039 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r97038‎ | r97039 | r97040 >
Date:07:47, 14 September 2011
Author:nikerabbit
Status:ok
Tags:
Comment:
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.
Modified paths:
  • /trunk/phase3/includes/logging/LogEntry.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/logging/LogEntry.php
——@@ -210,14 +210,8 @@
211211 $this->params = $params;
212212 $this->legacy = false;
213213 } else {
214 - $params = FormatJson::decode( $blob, true /* array */ );
215 - if ( $params !== null ) {
216 - $this->params = $params;
217 - $this->legacy = false;
218 - } else {
219 - $this->params = $blob === '' ? array() : explode( "\n", $blob );
220 - $this->legacy = true;
221 - }
 214+ $this->params = $blob === '' ? array() : explode( "\n", $blob );
 215+ $this->legacy = true;
222216 }
223217 }
224218 return $this->params;

Status & tagging log