Changeset 1051 for trunk/modules/output.tcl

Timestamp:

11/10/09 18:08:14 (3 years ago)

Author:

james

Message:

fix broken abstracts
fix %% expanding to contain other macros

File:

• trunk/modules/output.tcl (modified) (1 diff)

trunk/modules/output.tcl

@@ -241 +241 @@
         # Process macros
 
-        set text [bMotion_process_macros $channel $text]
-
-        # Run the plugins :D
-
-        # First run the core plugins
-        #set plugins [bMotion_plugin_find_output $bMotionInfo(language) $channel 0 10]
-        #if {[llength $plugins] > 0} {
-        #       foreach callback $plugins {
-        #               bMotion_putloglev 1 * "bMotion: output plugin: $callback..."
-        #               set result ""
-        #               catch {
-        #                       set result [$callback $channel $text]
-        #               } err
-        #               bMotion_putloglev 3 * "bMotion: returned from output $callback ($result)"
-        #               # TODO: Still used?
-        #               if {$result == ""} {
-        #                       return 0
-        #               }
-        #               set text $result
-        #       }
-        #}
-
-        set text [bMotionDoInterpolation $text $nick $moreText $channel]
+        set original_line $text
+        set done 0
+        while {$done == 0} {
+                set text [bMotion_process_macros $channel $text]
+
+                set text [bMotionDoInterpolation $text $nick $moreText $channel]
+
+                if {$text == $original_line} {
+                        set done 1
+                } else {
+                        set original_line $text
+                        bMotion_putloglev d * "output: going round macro loop again"
+                }
+        }
 
         # now the rest