--- Zope2/lib/python/DocumentTemplate/DT_Var.py	Mon Dec 13 20:14:51 1999
+++ Zope2-verrokki/lib/python/DocumentTemplate/DT_Var.py	Fri Feb  4 14:46:59 2000
@@ -264,11 +264,12 @@
 
         if val is None:
             if md.has_key(name):
-                if have_arg('url'):
-                    val=md.getitem(name,0)
-                    val=val.absolute_url()
+                # In order to make <dtml-var this url> and &dtml.url-this;
+                # work, this() needs attention here.
+                if name=='this' or not have_arg('url'):
+                    val=md[name]
                 else:
-                    val = md[name]
+                    val=md.getitem(name,0)
             else:
                 if have_arg('missing'):
                     return args['missing']
@@ -276,7 +277,8 @@
                     raise KeyError, name
         else:
             val=val.eval(md)
-            if have_arg('url'): val=val.absolute_url()
+
+        if have_arg('url'): val=val.absolute_url()
 
         __traceback_info__=name, val, args