From 2ccff45221905981c6942f1f3064d477113e959e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 23 Feb 2014 18:40:43 -0800
Subject: In case a page has overloaded a module, see if we already have a
 layout defined. Otherwise, if a pdl file exists for this module, use it.

---
 boot.php    | 5 ++++-
 version.inc | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index fb029c44e..be6b5c84b 100755
--- a/boot.php
+++ b/boot.php
@@ -1804,7 +1804,10 @@ function construct_page(&$a) {
 
 	require_once('include/comanche.php');
 
-	if(($p = theme_include('mod_' . $a->module . '.pdl')) != '')
+	// in case a page has overloaded a module, see if we already have a layout defined
+	// otherwise, if a pdl file exists for this module, use it
+
+	if((! count($a->layout)) && ($p = theme_include('mod_' . $a->module . '.pdl')) != '')
 		comanche_parser($a,@file_get_contents($p));
 
 	$comanche = ((count($a->layout)) ? true : false);
diff --git a/version.inc b/version.inc
index ad4b11889..490208526 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-22.596
+2014-02-23.597
-- 
cgit v1.2.3