http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88747
Revision: 88747
Author: jeroendedauw
Date: 2011-05-24 20:54:36 +0000 (Tue, 24 May 2011)
Log Message:
-----------
some more minor sql fixes
Modified Paths:
--------------
trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
trunk/extensions/SemanticWatchlist/includes/SWL_ChangeSet.php
Modified: trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
===================================================================
--- trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
2011-05-24 20:38:40 UTC (rev 88746)
+++ trunk/extensions/SemanticWatchlist/api/ApiDeleteWatchlistGroup.php
2011-05-24 20:54:36 UTC (rev 88747)
@@ -55,6 +55,14 @@
$dbr = wfGetDB( DB_SLAVE );
+ $setsForGroup = $dbr->select(
+ 'swl_sets_per_group',
+ array( 'spg_set_id' ),
+ array(
+ 'spg_group_id' => $groupId,
+ )
+ );
+
// Find all edits linked to this group.
$editsForGroup = $dbr->select(
array( 'swl_sets_per_group', 'swl_sets_per_edit' ),
@@ -108,6 +116,13 @@
);
}
+ foreach ( $setsForGroup as $set ) {
+ $dbw->delete(
+ 'swl_sets',
+ array( 'set_id' => $set->spg_set_id )
+ );
+ }
+
// Delete sets per group links for this group.
$result = $dbw->delete(
'swl_sets_per_group',
Modified: trunk/extensions/SemanticWatchlist/includes/SWL_ChangeSet.php
===================================================================
--- trunk/extensions/SemanticWatchlist/includes/SWL_ChangeSet.php
2011-05-24 20:38:40 UTC (rev 88746)
+++ trunk/extensions/SemanticWatchlist/includes/SWL_ChangeSet.php
2011-05-24 20:54:36 UTC (rev 88747)
@@ -502,7 +502,7 @@
$dbw->insert(
'swl_sets',
- array()
+ array( 'set_id' => null )
);
$id = $dbw->insertId();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
