Index: openacs-4/contrib/packages/portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/portal-procs.tcl,v diff -u -r1.33 -r1.34 --- openacs-4/contrib/packages/portal/tcl/portal-procs.tcl 26 Jun 2004 00:36:01 -0000 1.33 +++ openacs-4/contrib/packages/portal/tcl/portal-procs.tcl 20 Jul 2004 21:08:09 -0000 1.34 @@ -630,7 +630,12 @@ set master_portal_id [portal::new \ -name "Shared Portal" \ -owner_id 0 \ - -theme_name [parameter::get -parameter DefaultThemeName] \ + -theme_name [parameter::get \ + -parameter DefaultThemeName \ + -package_id $package_id \ + -default [parameter::get_from_package_key \ + -package_key portal \ + -parameter -DefaultThemeName]] \ -owner_privileges {}] # create the admin template @@ -639,7 +644,12 @@ -name "Portal Administration" \ -owner_id $package_id \ -page_list {{"Portal Administration" 2_column}} \ - -theme_name [parameter::get -parameter DefaultThemeName] \ + -theme_name [parameter::get \ + -parameter DefaultThemeName \ + -package_id $package_id \ + -default [parameter::get_from_package_key \ + -package_key portal \ + -parameter -DefaultThemeName]] \ -owner_privileges {}] db_foreach select_portal_datasources {} { Index: openacs-4/contrib/packages/portal/tcl/theme-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/theme-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/portal/tcl/theme-procs.tcl 14 Mar 2004 01:16:32 -0000 1.4 +++ openacs-4/contrib/packages/portal/tcl/theme-procs.tcl 20 Jul 2004 21:08:10 -0000 1.5 @@ -43,14 +43,19 @@ } ad_proc -public get_id { - {-name:required} + {-name} } { Return a theme's id - @name The name of the theme + @name The name of the theme, defaults to the portal default theme name @return The theme_id } { + if { ![info exists name]} { + set name [parameter::get_from_package_key \ + -package_key portal \ + -parameter -DefaultThemeName] + } return [db_string select_theme_id {}] }