Collector #799: Eliminate improper uses of SCRIPT_NAME.

doc/CHANGES.txt

@@ -33,6 +33,8 @@ Zope Changes
        (such as storages, databases, or logging handlers) to be used.
 
     Bugs fixed
+     - Collector #799: Eliminate improper uses of SCRIPT_NAME.
+
      - Collector #445: Add internal global declaration for Script bindings.
 
      - Collector #616: Make CONTEXTS available to TALES Python expressions.

lib/python/Products/ZopeTutorial/TutorialTopic.py

@@ -130,7 +130,7 @@ class GlossaryTopic(TutorialTopic):
         Returns the URL to a API documentation for a given class.
         """
         names=klass.split('.')
-        url="%s/Control_Panel/Products/%s/Help/%s.py#%s" % (REQUEST['SCRIPT_NAME'],
+        url="%s/Control_Panel/Products/%s/Help/%s.py#%s" % (REQUEST['BASEPATH1'],
                 names[0], names[1], names[2])
         return '<a href="%s">API Documentation</a>' % url
 
@@ -138,7 +138,7 @@ class GlossaryTopic(TutorialTopic):
         """
         Returns the URL to a DTML Reference page for a given tag.
         """
-        url="%s/Control_Panel/Products/OFSP/Help/dtml-%s.stx" % (REQUEST['SCRIPT_NAME'], tag)
+        url="%s/Control_Panel/Products/OFSP/Help/dtml-%s.stx" % (REQUEST['BASEPATH1'], tag)
         return '<a href="%s">DTML Reference</a>' % url
 
 

lib/python/TreeDisplay/TreeTag.py

@@ -12,8 +12,8 @@
 ##############################################################################
 """Rendering object hierarchies as Trees
 """
-__rcs_id__='$Id: TreeTag.py,v 1.53 2002/08/14 22:02:25 mj Exp $'
-__version__='$Revision: 1.53 $'[11:-2]
+__rcs_id__='$Id: TreeTag.py,v 1.54 2003/11/04 21:17:22 evan Exp $'
+__version__='$Revision: 1.54 $'[11:-2]
 
 from DocumentTemplate.DT_Util import *
 from DocumentTemplate.DT_String import String
@@ -332,7 +332,7 @@ def tpRenderTABLE(self, id, root_url, url, state, substate, diff, data,
             s=translate(s, tplus)
             ####################################
 
-            script=md['SCRIPT_NAME']
+            script=md['BASEPATH1']
 
             # Propagate extra args through tree.
             if args.has_key( 'urlparam' ):