Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/resources/masters/2cols.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.39.2.3 -r1.39.2.4
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	29 Aug 2015 10:20:04 -0000	1.39.2.3
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	2 Sep 2015 09:43:58 -0000	1.39.2.4
@@ -67,7 +67,7 @@
   }
   
   template::adp_append_code "
-    set __adp_master \[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
+    set __adp_master \[template::util::master_to_file \"$src\" \"\$__adp_stub\"\]"
 }
 
 # Insert the slave template
Index: openacs-4/packages/acs-templating/tcl/util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/util-procs.tcl,v
diff -u -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/acs-templating/tcl/util-procs.tcl	27 Aug 2015 08:06:58 -0000	1.28.2.1
+++ openacs-4/packages/acs-templating/tcl/util-procs.tcl	2 Sep 2015 09:43:58 -0000	1.28.2.2
@@ -482,16 +482,35 @@
   close $fd
 }
 
+ad_proc -public template::util::master_to_file { url {reference_url ""} } {
+    
+    Resolve a URL into an absolute file path, but respect styled
+    master configuration for named masters
+    (e.g. acs-templating/resources/masters/... containing 2cols.adp)
+    
+} {
+    if { [string index $url 0] ne "/" } {
+	set master_stub [template::resource_path -type masters -style $url]
+
+	if {[file exists $master_stub.adp]} {
+	    set path $master_stub
+	} else {
+	    set path [file dirname $reference_url]/$url
+	}
+	
+    } else {
+	set path $::acs::rootdir/$url
+    }
+    return [ns_normalizepath $path]
+}
+
 ad_proc -public template::util::url_to_file { url {reference_url ""} } {
     Resolve a URL into an absolute file path.
 } {
 
   if { [string index $url 0] ne "/" } {
-
     set path [file dirname $reference_url]/$url
-
   } else {
-
     set path $::acs::rootdir/$url
   }