From 8f5dd8928489d9f575dd0b9aa7848463d2944c58 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 1 May 2016 10:34:34 -0700
Subject: [PATCH] Fix for forgotten password page layout in membersonly mode.

---
 e107_core/shortcodes/batch/user_shortcodes.php |  2 +-
 e107_core/templates/fpw_template.php           |  4 ++--
 e107_handlers/e_parse_class.php                |  2 +-
 fpw.php                                        | 12 +++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index 650292877..3a16984db 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -175,7 +175,7 @@ class user_shortcodes extends e_shortcode
 		}
 		else
 		{
-			return $USER_LEVEL = $ldata[1];
+			return $ldata[1];
 		}
 	}
 	
diff --git a/e107_core/templates/fpw_template.php b/e107_core/templates/fpw_template.php
index 13e30d526..40a4a67ce 100644
--- a/e107_core/templates/fpw_template.php
+++ b/e107_core/templates/fpw_template.php
@@ -93,8 +93,8 @@ $FPW_TEMPLATE['form'] = '
 						</div>
 					</div>
 					';
-$FPW_TEMPLATE['header'] = '';
-$FPW_TEMPLATE['footer'] = '';
+$FPW_TEMPLATE['header'] = '<div id="fpw-page" class="container">';
+$FPW_TEMPLATE['footer'] = '</div>';
 
 
 
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index bade07bde..16f626778 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3942,7 +3942,7 @@ class e_parser
 	 */
 	public function toDate($datestamp = null, $format='short')
 	{
-		if(!is_numeric($datestamp)){ return; }
+		if(!is_numeric($datestamp)){ return null; }
 
 		return '<span data-livestamp="'.$datestamp.'">'.e107::getDate()->convert($datestamp, $format).'</span>';	
 	}
diff --git a/fpw.php b/fpw.php
index 12fe96517..9d5016e63 100644
--- a/fpw.php
+++ b/fpw.php
@@ -130,9 +130,15 @@ if ($pref['membersonly_enabled'])
 	{
 		require_once (e107::coreTemplatePath('fpw')); //correct way to load a core template.
 	}
-	
-	$HEADER = $tp->simpleParse($FPW_TABLE_HEADER, $sc);
-	$FOOTER = $tp->simpleParse($FPW_TABLE_FOOTER, $sc);
+
+	define('e_IFRAME', true);
+	$HEAD = $tp->simpleParse($FPW_TABLE_HEADER, $sc);
+	$FOOT = $tp->simpleParse($FPW_TABLE_FOOTER, $sc);
+
+	define('e_IFRAME_HEADER', $HEAD);
+	define('e_IFRAME_FOOTER' , $FOOT);
+
+
 }
 
 $user_info = e107::getUserSession();