[Pkg-mediawiki-commits] r534 - in mediawiki-extensions/branches/wheezy: . debian dist/mediawiki-extensions-openid dist/mediawiki-extensions-openid/usr/share dist/mediawiki-extensions-openid/usr/share/mediawiki dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions/openid
Thorsten Glaser
tg at moszumanska.debian.org
Thu Apr 3 07:53:02 UTC 2014
Author: tg
Date: 2014-04-03 07:53:02 +0000 (Thu, 03 Apr 2014)
New Revision: 534
Added:
mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/
mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/
mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions/
mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions/openid/
mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions/openid/optionToTable.php
Removed:
mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/var/
Modified:
mediawiki-extensions/branches/wheezy/debian/changelog
mediawiki-extensions/branches/wheezy/svn-revisions
Log:
pull revision 506: fixes another piuparts conflict (dir vs. symlink)
ACK?\226?\128?\153d in <a096d1936a2766483b154a041d96b50a.squirrel at aphrodite.kinkhorst.nl>
Modified: mediawiki-extensions/branches/wheezy/debian/changelog
===================================================================
--- mediawiki-extensions/branches/wheezy/debian/changelog 2014-04-01 10:50:10 UTC (rev 533)
+++ mediawiki-extensions/branches/wheezy/debian/changelog 2014-04-03 07:53:02 UTC (rev 534)
@@ -4,6 +4,7 @@
uninstallability of the mediawiki-extensions metapackage (and
shipping the mediawiki-extensions-confirmedit package); found
by Axel “XTaran” Beckert; thanks!
+ * Do not install into symlinks to directories (Closes: #736558)
-- Thorsten Glaser <tg at mirbsd.de> Tue, 01 Apr 2014 12:46:49 +0200
Copied: mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions/openid/optionToTable.php (from rev 533, mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/var/lib/mediawiki/maintenance/mediawiki-extensions/openid/optionToTable.php)
===================================================================
--- mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions/openid/optionToTable.php (rev 0)
+++ mediawiki-extensions/branches/wheezy/dist/mediawiki-extensions-openid/usr/share/mediawiki/maintenance/mediawiki-extensions/openid/optionToTable.php 2014-04-03 07:53:02 UTC (rev 534)
@@ -0,0 +1,62 @@
+<?php
+/**
+ * optionToTable.php -- Convert old user_options-based
+ * Copyright 2006,2007 Internet Brands (http://www.internetbrands.com/)
+ * By Evan Prodromou <evan at wikitravel.org>
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @file
+ * @author Evan Prodromou <evan at wikitravel.org>
+ * @ingroup Extensions
+ */
+
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+ $IP = dirname( __FILE__ ) . '/../..';
+}
+require_once( "$IP/maintenance/Maintenance.php" );
+
+class OpenIDOptionToTable extends Maintenance {
+ public function __construct() {
+ parent::__construct();
+ $this->mDescription = 'Convert user_option-stored urls to the new openID table';
+ }
+
+ public function execute() {
+ $dbr = wfGetDB( DB_SLAVE );
+ if ( !$dbr->tableExists( 'user_properties' ) ) {
+ $this->error( "The OpenID extension requires at least MediaWiki 1.16.", true );
+ }
+
+ $this->output( "Checking for legacy user_property rows..." );
+ $dbr = wfGetDB( DB_SLAVE );
+ $res = $dbr->select( array( 'user_properties' ), array( 'up_user' ),
+ array( 'up_property' => 'openid_url' ), __METHOD__ );
+ if ( $dbr->numRows( $res ) ) {
+ foreach ( $res as $row ) {
+ $user = User::newFromId( $row->up_user );
+ $this->output( "\n\tFixing {$user->getName()}" );
+ SpecialOpenID::addUserUrl( $user, $user->getOption( 'openid_url' ) );
+ }
+ $this->output( "done\n" );
+ } else {
+ $this->output( "none found\n" );
+ }
+ }
+}
+
+$maintClass = 'OpenIDOptionToTable';
+require_once( RUN_MAINTENANCE_IF_MAIN );
Modified: mediawiki-extensions/branches/wheezy/svn-revisions
===================================================================
--- mediawiki-extensions/branches/wheezy/svn-revisions 2014-04-01 10:50:10 UTC (rev 533)
+++ mediawiki-extensions/branches/wheezy/svn-revisions 2014-04-03 07:53:02 UTC (rev 534)
@@ -164,7 +164,7 @@
http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/TODO - OpenID - openid - usr/share/doc - no - 89014
http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/openid_table.pg.sql - OpenID - openid - usr/share - no - 0
http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/openid_table.sql - OpenID - openid - usr/share - no - 0
-http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/optionToTable.php - OpenID - openid - var/lib/mediawiki/maintenance - no - 106861
+http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/optionToTable.php - OpenID - openid - usr/share/mediawiki/maintenance - no - 106861
http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/patches/ - OpenID - openid - usr/share - no - 99511
http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/php-openid-2.2.2.tar.gz.sha1 - none - none - none - no - -1
http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_19/extensions/OpenID/skin/ - OpenID - openid - usr/share - no - 87850
More information about the Pkg-mediawiki-commits
mailing list