--- templates/edit.kupu.tmpl	Tue Apr  4 11:53:26 2006
+++ templates/edit.kupu.tmpl	Mon Jul 24 19:10:16 2006
@@ -369,7 +369,7 @@
    </div>
 <!-- EDITOR IFRAME -->
    <div class="kupu-editorframe">
-    <iframe id="kupu-editor" class="kupu-editor-iframe" frameborder="1" src="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%?skin=kupu;wysiwyg_edit=1;t=%GMTIME{"$ye$mo$day$hou$min$sec"}%" scrolling="auto">
+    <iframe id="kupu-editor" class="kupu-editor-iframe" frameborder="1" src="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%OWEB%/%OTOPIC%?skin=kupu;wysiwyg_edit=1;foo=bar;t=%GMTIME{"$ye$mo$day$hou$min$sec"}%" scrolling="auto">
     </iframe>
 <!-- HTML EDITOR -->
     <textarea class="kupu-editor-textarea" id="kupu-editor-textarea">
--- lib/TWiki/Plugins/WysiwygPlugin.pm	Tue Apr  4 11:53:26 2006
+++ lib/TWiki/Plugins/WysiwygPlugin.pm	Mon Jul 24 20:01:57 2006
@@ -78,8 +78,49 @@
 
     $SKIN = TWiki::Func::getPreferencesValue( 'WYSIWYGPLUGIN_WYSIWYGSKIN' );
 
+    # %OWEB%.%OTOPIC% is the topic where the initial content should be
+    # grabbed from, as defined in templates/edit.kupu.tmpl
+    TWiki::Func::registerTagHandler('OWEB',\&_OWEBTAG);
+    TWiki::Func::registerTagHandler('OTOPIC',\&_OTOPICTAG);
+
     # Plugin correctly initialized
     return 1;
+}
+
+sub _OWEBTAG {
+    my($session, $params, $theTopic, $theWeb) = @_;
+
+    my $query = TWiki::Func::getCgiQuery();
+
+    return "$theWeb" unless $query;
+  
+    if(defined($query->param('templatetopic'))) {
+        my @split=split(/\./,$query->param('templatetopic'));
+
+	if($#split==0) {
+	  return $theWeb;
+	} else {
+	  return $split[0];
+	}
+    }
+
+    return $theWeb;
+}
+
+sub _OTOPICTAG {
+    my($session, $params, $theTopic, $theWeb) = @_;
+
+    my $query = TWiki::Func::getCgiQuery();
+
+    return "$theTopic" unless $query;
+  
+    if(defined($query->param('templatetopic'))) {
+        my @split=split(/\./,$query->param('templatetopic'));
+
+	return $split[$#split];
+    }
+
+    return $theTopic;
 }
 
 # This handler is used to determine whether the topic is editable by