https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113863
Revision: 113863
Author: wikinaut
Date: 2012-03-14 21:43:56 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
follow up r113839 fixes the initial database creation problem. relies on
r113862 .
Modified Paths:
--------------
trunk/extensions/AJAXPoll/AJAXPoll.php
trunk/extensions/AJAXPoll/AJAXPoll_body.php
trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_info.sql
trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_vote.sql
Added Paths:
-----------
trunk/extensions/AJAXPoll/patches/rename-table--poll_info.sql
trunk/extensions/AJAXPoll/patches/rename-table--poll_vote.sql
Modified: trunk/extensions/AJAXPoll/AJAXPoll.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-14 21:41:37 UTC (rev
113862)
+++ trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-14 21:43:56 UTC (rev
113863)
@@ -19,7 +19,7 @@
* @author Jack Phoenix <[email protected]>
* @author Thomas Gries
* @maintainer Thomas Gries
- * @version 1.72
+ * @version 1.73
* @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation
*/
@@ -31,7 +31,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'AJAX Poll',
- 'version' => '1.72 20120314',
+ 'version' => '1.73 20120314',
'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries'
),
'descriptionmsg' => 'ajaxpoll-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
Modified: trunk/extensions/AJAXPoll/AJAXPoll_body.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-14 21:41:37 UTC (rev
113862)
+++ trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-14 21:43:56 UTC (rev
113863)
@@ -399,23 +399,38 @@
} else {
// >= 1.17 support
- # poll_info.poll_title field was dropped in AJAXPoll
version 1.72
- $updater->dropExtensionField(
- 'poll_info',
- 'poll_title',
- dirname( __FILE__ ) .
'/patches/drop-field--poll_info-poll_title.sql'
- );
+ if ( $updater->extensionTableExists( 'poll_info' ) ) {
+ # poll_info.poll_title field was dropped in
AJAXPoll version 1.72
+ $updater->dropExtensionField(
+ 'poll_info',
+ 'poll_title',
+ dirname( __FILE__ ) .
'/patches/drop-field--poll_info-poll_title.sql'
+ );
+ $updater->addExtensionTable(
+ 'ajaxpoll_info',
+ dirname( __FILE__ ) .
'/patches/rename-table--poll_info.sql'
+ );
+ } else {
+ $updater->addExtensionTable(
+ 'ajaxpoll_info',
+ dirname( __FILE__ ) .
'/patches/create-table--ajaxpoll_info.sql'
+ );
+ }
- $updater->addExtensionTable(
- 'ajaxpoll_info',
- dirname( __FILE__ ) .
'/patches/create-table--ajaxpoll_info.sql'
- );
- $updater->addExtensionTable(
- 'ajaxpoll_vote',
- dirname( __FILE__ ) .
'/patches/create-table--ajaxpoll_vote.sql'
- );
+ if ( $updater->extensionTableExists( 'poll_vote' ) ) {
+ $updater->addExtensionTable(
+ 'ajaxpoll_vote',
+ dirname( __FILE__ ) .
'/patches/rename-table--poll_vote.sql'
+ );
+ } else {
+ $updater->addExtensionTable(
+ 'ajaxpoll_vote',
+ dirname( __FILE__ ) .
'/patches/create-table--ajaxpoll_vote.sql'
+ );
+ }
}
+
return true;
}
Modified: trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_info.sql
===================================================================
--- trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_info.sql
2012-03-14 21:41:37 UTC (rev 113862)
+++ trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_info.sql
2012-03-14 21:43:56 UTC (rev 113863)
@@ -1,4 +1,3 @@
-RENAME TABLE /*_*/poll_info TO /*_*/ajaxpoll_info;
CREATE TABLE IF NOT EXISTS /*_*/ajaxpoll_info (
`poll_id` varchar(32) NOT NULL PRIMARY KEY default '',
`poll_txt` text,
Modified: trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_vote.sql
===================================================================
--- trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_vote.sql
2012-03-14 21:41:37 UTC (rev 113862)
+++ trunk/extensions/AJAXPoll/patches/create-table--ajaxpoll_vote.sql
2012-03-14 21:43:56 UTC (rev 113863)
@@ -1,4 +1,3 @@
-RENAME TABLE /*_*/poll_vote TO /*_*/ajaxpoll_vote;
CREATE TABLE IF NOT EXISTS /*_*/ajaxpoll_vote (
`poll_id` varchar(32) NOT NULL default '',
`poll_user` varchar(255) NOT NULL default '',
Added: trunk/extensions/AJAXPoll/patches/rename-table--poll_info.sql
===================================================================
--- trunk/extensions/AJAXPoll/patches/rename-table--poll_info.sql
(rev 0)
+++ trunk/extensions/AJAXPoll/patches/rename-table--poll_info.sql
2012-03-14 21:43:56 UTC (rev 113863)
@@ -0,0 +1 @@
+RENAME TABLE /*_*/poll_info TO /*_*/ajaxpoll_info;
Property changes on:
trunk/extensions/AJAXPoll/patches/rename-table--poll_info.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/extensions/AJAXPoll/patches/rename-table--poll_vote.sql
===================================================================
--- trunk/extensions/AJAXPoll/patches/rename-table--poll_vote.sql
(rev 0)
+++ trunk/extensions/AJAXPoll/patches/rename-table--poll_vote.sql
2012-03-14 21:43:56 UTC (rev 113863)
@@ -0,0 +1 @@
+RENAME TABLE /*_*/poll_vote TO /*_*/ajaxpoll_vote;
Property changes on:
trunk/extensions/AJAXPoll/patches/rename-table--poll_vote.sql
___________________________________________________________________
Added: svn:eol-style
+ native
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
