Index: openacs-4/www/default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/www/default-master.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/www/default-master.tcl	20 Mar 2002 20:25:42 -0000	1.2
@@ -8,6 +8,20 @@
 # $Id$
 #
 
+
+# Pull out the package_id of the subsite closest to our current node
+set pkg_id [site_node_closest_ancestor_package "acs-subsite"]
+
+# see if we have the parameter in the closest acs-subsite package
+# to override this file in favor of the site-specific master
+set have_site_master_p [ad_parameter -package_id $pkg_id UseSiteSpecificMaster dummy "0"]
+
+if {$have_site_master_p} {
+
+    ad_return_template "/www/site-specific-master"
+}
+
+
 # fall back on defaults for title, signatory and header_stuff
 
 if [template::util::is_nil title]     { set title        [ad_system_name]  }
@@ -19,9 +33,6 @@
 
 template::multirow create attribute key value
 
-# Pull out the package_id of the subsite closest to our current node
-set pkg_id [site_node_closest_ancestor_package "acs-subsite"]
-
 template::multirow append \
     attribute bgcolor [ad_parameter -package_id $pkg_id bgcolor   dummy "white"]
 template::multirow append \