From a94452a8204617f4795a11c287690cbfc30108f4 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 6 Nov 2010 11:30:21 +0000
Subject: [PATCH] reinsert some statements removed by r74745

You removed a free() statement in filerepo/LocalRepo.php
In Wiki.php the explicit $ret = null was welcomed
---
 includes/Wiki.php               | 1 +
 includes/filerepo/LocalRepo.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/includes/Wiki.php b/includes/Wiki.php
index c31a6ab28e..ff80a9721d 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -108,6 +108,7 @@ class MediaWiki {
 		if( $wgRequest->getVal( 'printable' ) === 'yes' ) {
 			$wgOut->setPrintable();
 		}
+		$ret = null;
 		$curid = $wgRequest->getInt( 'curid' );
 		if( $curid ) {
 			// URLs like this are generated by RC, because rc_title isn't always accurate
diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 50a83f6c9a..e556887009 100644
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -167,6 +167,7 @@ class LocalRepo extends FSRepo {
 		foreach ( $res as $row ) {
 			$result[] = $this->newFileFromRow( $row );
 		}
+		$res->free();
 
 		return $result;
 	}
-- 
2.20.1