Index: openacs-4/packages/acs-subsite/www/o.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/o.vuh,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/o.vuh	22 Oct 2010 14:31:14 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/o.vuh	27 Oct 2014 16:39:47 -0000	1.7
@@ -16,7 +16,7 @@
     return
 }
 
-if {![empty_string_p $anchor]} { 
+if {$anchor ne ""} { 
     set anchor "#$anchor"
 }
 
@@ -31,20 +31,20 @@
 
 # Users are handled as a special case since we want to preserve the subsite
 # we are loading from...
-if {[string eq $object_type user]} {
+if {$object_type eq "user"} {
     ad_returnredirect [acs_community_member_url -user_id $object_id]
     ad_script_abort
 }
 
 
-if {[string eq $object_type content_item]} {
+if {$object_type eq "content_item"} {
     db_0or1row object_data {
         select o.object_type, o.object_id, o.package_id
         from acs_objects o, cr_items i
         where i.item_id = :object_id
           and o.object_id = coalesce(i.live_revision, i.latest_revision, i.item_id)
     }
-    if {[string eq $object_type content_item]} {
+    if {$object_type eq "content_item"} {
         # punt, assume file storage extlink for now
         # JCDXXX TODO: figure out what to do...
         ad_returnredirect [apm_package_url_from_id $package_id]simple?object_id=$object_id&todo=fixthis
@@ -65,11 +65,11 @@
 set page_url [lindex [callback -catch -impl $object_type subsite::url -object_id $object_id -package_id $package_id -type "display"] 0]
 
 # If this did not work, try again with the Service contract
-if {[empty_string_p $page_url]} {
+if {$page_url eq ""} {
 	set page_url [acs_sc::invoke -contract FtsContentProvider -operation url -impl $object_type -call_args [list $object_id]]
 }
 
-if {![empty_string_p $page_url]} {
+if {$page_url ne ""} {
     ad_returnredirect $page_url$anchor
 } else {
     ad_return_warning "Invalid object ID" [subst {