Changeset 246 for trunk/RebuildQueue

Timestamp:

05/04/07 23:58:30 (3 years ago)

Author:

jallen

Message:

* Fixed issue where junking/approving/unjunking of comments and pings (via mode rebuild_phase) was circumventing the RebuildQueue
* Fixed two "Use of uninitialized values" warnings in RebuildQueue::Plugin

Files:

• trunk/RebuildQueue/plugins/RebuildQueue/lib/RebuildQueue/Plugin.pm (modified) (4 diffs)

trunk/RebuildQueue/plugins/RebuildQueue/lib/RebuildQueue/Plugin.pm

@@ -92 +92 @@
 
         my $override = $plugin->blog_cms_override($app->param('blog_id'));
-        
+
     # For CMS, disable in certain situations...
     if ($app->isa('MT::App::CMS') && $override) {
@@ -98 +98 @@
         my $mode = $app->mode;
 
-        # Explicit rebuilds should bypass queue, but not sync
-        if ($mode =~ m/^rebuild/) {
+        # Explicit rebuilds should bypass queue, but not sync.
+        # Mode "rebuild-phase" is used for approve_item,
+        # unapprove_item, handle_junk and not_junk methods and
+        # should be processed by RebuildQueue
+        if ($mode =~ m/^rebuild(?!_phase)/) {
             $plugin->disable;
 
@@ -277 +280 @@
 sub blog_cms_override {
     my $plugin = shift;
-    my ($blog_id) = @_;
+    my ($blog_id) = @_ || '';
     $plugin->get_config_value('rebuildq_cms_override', 'blog:'.$blog_id) ? 1 : 0;
 }
@@ -286 +289 @@
     my $workers = $plugin->get_config_value('workers') || 1;
     my $worker = $plugin->get_config_value('worker', 'blog:'.$blog_id);
-    $worker = 1 if (defined $worker) && ($worker > $workers);
+    $worker = 1 if (defined $worker) && ($worker ne "") && ($worker > $workers);
     if (!defined($worker) || ($worker eq '')) {
         $worker = int(rand($workers)) + 1;