Index: openacs-4/contrib/packages/portal/lib/tabbed-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/tabbed-master.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	18 Mar 2004 18:14:13 -0000	1.3
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.tcl	19 Mar 2004 00:41:22 -0000	1.4
@@ -27,43 +27,40 @@
 set package_id [site_node::get_object_id -node_id [site_node::get_node_id -url $portal_url]]
 set portal_page_p 0
 
-if { ![string equal $package_id ""] } {
+set user_portal_id [portal::get_user_portal_id -package_id $package_id]
+set which_navbar [parameter::get -package_id $package_id -parameter NavbarClass]
+set portal_url [site_node::get_url_from_object_id -object_id $package_id]
+array set theme [portal::theme::get -theme_id [portal::get_theme_id -portal_id $user_portal_id]]
+set theme_filename $theme(filename)
+set theme_resource_dir $theme(resource_dir)
+set master_template [parameter::get -package_id $package_id -parameter SiteMasterTemplate]
 
-    set user_portal_id [portal::get_user_portal_id -package_id $package_id]
-    set which_navbar [parameter::get -package_id $package_id -parameter NavbarClass]
-    set portal_url [site_node::get_url_from_object_id -object_id $package_id]
-    array set theme [portal::theme::get -theme_id [portal::get_theme_id -portal_id $user_portal_id]]
-    set theme_filename $theme(filename)
-    set theme_resource_dir $theme(resource_dir)
+db_multirow -unclobber -extend {url} portal_pages select_user_portal_pages {} {
+    set url [export_vars -base $portal_url {portal_id page_num}]
+    if { [string equal $url $portal_url] } {
+        set portal_page_p 1
+    }
+}
 
-    db_multirow -unclobber -extend {url} portal_pages select_user_portal_pages {} {
+if { [permission::permission_p \
+         -object_id [portal::get_admin_portal_id -package_id $package_id] \
+         -privilege admin] } {
+    db_multirow -unclobber -append -extend {url} portal_pages select_admin_portal_pages {} {
         set url [export_vars -base $portal_url {portal_id page_num}]
         if { [string equal $url $portal_url] } {
             set portal_page_p 1
         }
     }
+}
 
-    if { [permission::permission_p \
-             -object_id [portal::get_admin_portal_id -package_id $package_id] \
-             -privilege admin] } {
-        db_multirow -unclobber -append -extend {url} portal_pages select_admin_portal_pages {} {
-            set url [export_vars -base $portal_url {portal_id page_num}]
-            if { [string equal $url $portal_url] } {
-                set portal_page_p 1
-            }
-        }
-    }
+array set site_node [site_node::get_from_url \
+                        -url [ad_conn package_url] \
+                        -exact]
 
-    array set site_node [site_node::get_from_url \
-                            -url [ad_conn package_url] \
-                            -exact]
-
-    if { $site_node(parent_id) == $package_id } {
-        set application $site_node(instance_name)
-    } elseif {$site_node(object_id) == $package_id } {
-        set portal_page_p 1
-    }
-
+if { $site_node(parent_id) == $package_id } {
+    set application $site_node(instance_name)
+} elseif {$site_node(object_id) == $package_id } {
+    set portal_page_p 1
 }