http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99529

Revision: 99529
Author:   wikinaut
Date:     2011-10-11 18:39:09 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
follow-up r99511 r97447 and not using dropIndex and addIndex directly any more. 
Only using addExtensionUpdate( array( dropIndex/addIndex )) for mw >= 1.17

Modified Paths:
--------------
    trunk/extensions/OpenID/OpenID.hooks.php
    trunk/extensions/OpenID/OpenID.php
    trunk/extensions/OpenID/README.OpenID-mediawiki-extension

Modified: trunk/extensions/OpenID/OpenID.hooks.php
===================================================================
--- trunk/extensions/OpenID/OpenID.hooks.php    2011-10-11 18:39:05 UTC (rev 
99528)
+++ trunk/extensions/OpenID/OpenID.hooks.php    2011-10-11 18:39:09 UTC (rev 
99529)
@@ -357,14 +357,10 @@
                        $db = $updater->getDB();
                        $info = $db->fieldInfo( 'user_openid', 'uoi_user' );
                        if ( !$info->isMultipleKey() ) {
-                               echo( "Making uoi_user field non UNIQUE...\n" );
-                               $updater->dropIndex( 'user_openid', 'uoi_user',
-                                       dirname( __FILE__ ) . 
'/patches/patch-drop_non_multiple_key_index_uoi_user.sql', true );
-                               $updater->addIndex( 'user_openid', 
'user_openid_user',
-                                       dirname( __FILE__ ) . 
'/patches/patch-add_multiple_key_index_user_openid_user.sql', true );
-                               echo( "...done.\n" );
-                       } else {
-                               echo( "...uoi_user field is already non 
UNIQUE.\n" );
+                               $updater->addExtensionUpdate( array( 
'dropIndex', 'user_openid', 'uoi_user',
+                                       dirname( __FILE__ ) . 
'/patches/patch-drop_non_multiple_key_index_uoi_user.sql', true ) );
+                               $updater->addExtensionUpdate( array( 
'addIndex', 'user_openid', 'user_openid_user',
+                                       dirname( __FILE__ ) . 
'/patches/patch-add_multiple_key_index_user_openid_user.sql', true ) );
                        }
                        
                        # uoi_user_registration field was added in OpenID 
version 0.937

Modified: trunk/extensions/OpenID/OpenID.php
===================================================================
--- trunk/extensions/OpenID/OpenID.php  2011-10-11 18:39:05 UTC (rev 99528)
+++ trunk/extensions/OpenID/OpenID.php  2011-10-11 18:39:09 UTC (rev 99529)
@@ -27,7 +27,7 @@
        exit( 1 );
 }
 
-define( 'MEDIAWIKI_OPENID_VERSION', '0.940-beta 20111011' );
+define( 'MEDIAWIKI_OPENID_VERSION', '0.941-beta 20111011' );
 
 $path = dirname( __FILE__ );
 set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . 
get_include_path() );

Modified: trunk/extensions/OpenID/README.OpenID-mediawiki-extension
===================================================================
--- trunk/extensions/OpenID/README.OpenID-mediawiki-extension   2011-10-11 
18:39:05 UTC (rev 99528)
+++ trunk/extensions/OpenID/README.OpenID-mediawiki-extension   2011-10-11 
18:39:09 UTC (rev 99529)
@@ -1,5 +1,5 @@
 MediaWiki OpenID extension README.OpenID-mediawiki-extension file
-version 0.940-beta 20111011
+version 0.941-beta 20111011
 
 Homepage and manual http://www.mediawiki.org/wiki/Extension:OpenID
 


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to