Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp	19 Dec 2007 12:28:52 -0000	1.4
+++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp	19 Aug 2008 08:59:15 -0000	1.4.2.1
@@ -1,12 +1,14 @@
 <master src="@dotlrn_master@">
+  <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
   <if @title@ not nil><property name="title">@title;noquote@</property></if>
+
+  <if @doc@ defined><property name="&doc">doc</property></if>
+
   <if @context@ not nil><property name="context">@context;noquote@</property></if>
   <if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-  <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
   <if @link_control_panel@ not nil><property name="link_control_panel">@link_control_panel;noquote@</property></if>
   <if @hide_feedback@ not nil><property name="hide_feedback">@hide_feedback@</property></if>
-  <if @title@ not nil><property name="title">@title;noquote@</property></if>
   <if @portal_page_p@ not nil><property name="portal_page_p">@portal_page_p;noquote@</property></if>
 
   <slave>
Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl	8 Aug 2006 21:26:24 -0000	1.2
+++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl	19 Aug 2008 08:59:15 -0000	1.2.4.1
@@ -11,6 +11,12 @@
 			    -default "/packages/dotlrn/www/dotlrn-master"]
 }
 
-if {![exists_and_not_null title]} {
+# Set page title
+if { ![info exists doc(title)] && [exists_and_not_null title] } {
+    set doc(title) $title
+} elseif { [info exists doc(title)] && ![exists_and_not_null title] } {
+    set title $doc(title)
+} elseif { ![info exists doc(title)] && [exists_and_not_null title] } {
     set title [ad_system_name]
-}
\ No newline at end of file
+    set doc(title) $title
+}