From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 maintenance/7zip.inc | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'maintenance/7zip.inc')

diff --git a/maintenance/7zip.inc b/maintenance/7zip.inc
index 617083bf..4ac480ed 100644
--- a/maintenance/7zip.inc
+++ b/maintenance/7zip.inc
@@ -1,4 +1,11 @@
 <?php
+/**
+ * 7z stream wrapper
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+
 /**
  * Stream wrapper around 7za filter program.
  * Required since we can't pass an open file resource to XMLReader->open()
@@ -8,62 +15,62 @@
  */
 class SevenZipStream {
 	var $stream;
-	
+
 	private function stripPath( $path ) {
 		$prefix = 'mediawiki.compress.7z://';
 		return substr( $path, strlen( $prefix ) );
 	}
-	
+
 	function stream_open( $path, $mode, $options, &$opened_path ) {
-		if( $mode[0] == 'r' ) {
+		if ( $mode[0] == 'r' ) {
 			$options = 'e -bd -so';
-		} elseif( $mode[0] == 'w' ) {
+		} elseif ( $mode[0] == 'w' ) {
 			$options = 'a -bd -si';
 		} else {
 			return false;
 		}
 		$arg = wfEscapeShellArg( $this->stripPath( $path ) );
 		$command = "7za $options $arg";
-		if( !wfIsWindows() ) {
+		if ( !wfIsWindows() ) {
 			// Suppress the stupid messages on stderr
 			$command .= ' 2>/dev/null';
 		}
-		$this->stream = popen( $command, $mode );
-		return ($this->stream !== false);
+		$this->stream = popen( $command, $mode[0] ); // popen() doesn't like two-letter modes
+		return ( $this->stream !== false );
 	}
-	
+
 	function url_stat( $path, $flags ) {
 		return stat( $this->stripPath( $path ) );
 	}
-	
+
 	// This is all so lame; there should be a default class we can extend
-	
+
 	function stream_close() {
 		return fclose( $this->stream );
 	}
-	
+
 	function stream_flush() {
 		return fflush( $this->stream );
 	}
-	
+
 	function stream_read( $count ) {
 		return fread( $this->stream, $count );
 	}
-	
+
 	function stream_write( $data ) {
 		return fwrite( $this->stream, $data );
 	}
-	
+
 	function stream_tell() {
 		return ftell( $this->stream );
 	}
-	
+
 	function stream_eof() {
 		return feof( $this->stream );
 	}
-	
+
 	function stream_seek( $offset, $whence ) {
 		return fseek( $this->stream, $offset, $whence );
 	}
 }
-stream_wrapper_register( 'mediawiki.compress.7z', 'SevenZipStream' );
\ No newline at end of file
+stream_wrapper_register( 'mediawiki.compress.7z', 'SevenZipStream' );
-- 
cgit v1.2.2