[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Formulator/Validators - LinkValidator.py:1.1.2.3

Jim Fulton jim@zope.com
Tue, 26 Mar 2002 16:26:24 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/App/Formulator/Validators
In directory cvs.zope.org:/tmp/cvs-serv7731/Zope/App/Formulator/Validators

Modified Files:
      Tag: Zope-3x-branch
	LinkValidator.py 
Log Message:
Merged the publication refactoring branch into the main branch.

Also renamed:

  browser_reaverse -> publishTraverse

  browser_default -> browserDefault



=== Zope3/lib/python/Zope/App/Formulator/Validators/LinkValidator.py 1.1.2.2 => 1.1.2.3 ===
             value = urljoin(REQUEST['BASE0'], value)
         elif linkType == 'relative':
-            value = urljoin(REQUEST['URL1'], value)
+            value = urljoin(REQUEST.URL[-1], value)
         # otherwise must be external
 
         # FIXME: should try regular expression to do some more checking here?