1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 20:51:53 +02:00

Fix for forgotten password page layout in membersonly mode.

This commit is contained in:
Cameron 2016-05-01 10:34:34 -07:00
parent bec7071cdf
commit 8f5dd89284
4 changed files with 13 additions and 7 deletions

View File

@ -175,7 +175,7 @@ class user_shortcodes extends e_shortcode
}
else
{
return $USER_LEVEL = $ldata[1];
return $ldata[1];
}
}

View File

@ -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>';

View File

@ -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>';
}

12
fpw.php
View File

@ -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();