From cca318981dfeff538ecb65ff460a590693c5a01a Mon Sep 17 00:00:00 2001
From: MarkAHershberger <mah@everybody.org>
Date: Mon, 12 Nov 2012 09:23:51 -0500
Subject: [PATCH] Bug 42039 - Fix some file-related issues in the distribution
 Minor issues.

Tested the removal of
maintenance/postgres/archives/patch-ipb_address_unique.sql in a new
installation but haven't tested it on an upgrade.

Change-Id: I58aa11c5acab5de427cbc000e6786a208fc6b26f
---
 maintenance/cleanupPreferences.php            | 104 +++++++++---------
 .../archives/patch-ipb_address_unique.sql     |   0
 2 files changed, 52 insertions(+), 52 deletions(-)
 mode change 100755 => 100644 maintenance/cleanupPreferences.php
 delete mode 100644 maintenance/postgres/archives/patch-ipb_address_unique.sql

diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php
old mode 100755
new mode 100644
index f37af775da..3539689a3e
--- a/maintenance/cleanupPreferences.php
+++ b/maintenance/cleanupPreferences.php
@@ -1,52 +1,52 @@
-<?php
-/**
- * Remove hidden preferences from the database.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author TyA <tya.wiki@gmail.com>
- * @see [[bugzilla:30976]]
- * @ingroup Maintenance
- */
-
-require_once( __DIR__ . '/Maintenance.php' );
-
-/**
- * Maintenance script that removes hidden preferences from the database.
- *
- * @ingroup Maintenance
- */
-class CleanupPreferences extends Maintenance {
-	public function execute() {
-		global $wgHiddenPrefs;
-
-		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin();
-		foreach( $wgHiddenPrefs as $item ) {
-			$dbw->delete(
-				'user_properties',
-				array( 'up_property' => $item ),
-				__METHOD__
-			);
-		};
-		$dbw->commit();
-		$this->output( "Finished!\n" );
-	}
-}
-
-$maintClass = 'CleanupPreferences'; // Tells it to run the class
-require_once( RUN_MAINTENANCE_IF_MAIN );
+<?php
+/**
+ * Remove hidden preferences from the database.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author TyA <tya.wiki@gmail.com>
+ * @see [[bugzilla:30976]]
+ * @ingroup Maintenance
+ */
+
+require_once( __DIR__ . '/Maintenance.php' );
+
+/**
+ * Maintenance script that removes hidden preferences from the database.
+ *
+ * @ingroup Maintenance
+ */
+class CleanupPreferences extends Maintenance {
+	public function execute() {
+		global $wgHiddenPrefs;
+
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->begin();
+		foreach( $wgHiddenPrefs as $item ) {
+			$dbw->delete(
+				'user_properties',
+				array( 'up_property' => $item ),
+				__METHOD__
+			);
+		};
+		$dbw->commit();
+		$this->output( "Finished!\n" );
+	}
+}
+
+$maintClass = 'CleanupPreferences'; // Tells it to run the class
+require_once( RUN_MAINTENANCE_IF_MAIN );
diff --git a/maintenance/postgres/archives/patch-ipb_address_unique.sql b/maintenance/postgres/archives/patch-ipb_address_unique.sql
deleted file mode 100644
index e69de29bb2..0000000000
-- 
2.20.1