From 0ac587207e97eeb79331fd5d9d72f1075324e612 Mon Sep 17 00:00:00 2001 From: jeroendedauw Date: Mon, 27 Aug 2012 17:56:15 +0200 Subject: [PATCH] Fix ZipDirectoryReader under Hiphop ZipDirectoryReaderError subclasses Exception, and sets the code property as a string. Php's documentation says this should be an int, so this is already a little bit weird. Under Hiphop, calling the parent constructor without the second parameter will set the code property to 0, because the parameter defaults to 0. This leads to uploads breaking, because calls to getErrorCode return 0 rather than the code that was passed in. The change renames the code property to errorCode, so it can't be confused with exception's code property, which should be an int. https://bugzilla.wikimedia.org/show_bug.cgi?id=39346 Patch by Chris Keeline Change-Id: I9b07a5f7f8ba7c980c0cb0da7b65816dc3b97c4c --- includes/ZipDirectoryReader.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/ZipDirectoryReader.php b/includes/ZipDirectoryReader.php index 5b96b409f9..0e84583f58 100644 --- a/includes/ZipDirectoryReader.php +++ b/includes/ZipDirectoryReader.php @@ -696,10 +696,10 @@ class ZipDirectoryReader { * Internal exception class. Will be caught by private code. */ class ZipDirectoryReaderError extends Exception { - var $code; + var $errorCode; function __construct( $code ) { - $this->code = $code; + $this->errorCode = $code; parent::__construct( "ZipDirectoryReader error: $code" ); } @@ -707,6 +707,6 @@ class ZipDirectoryReaderError extends Exception { * @return mixed */ function getErrorCode() { - return $this->code; + return $this->errorCode; } } -- 2.20.1