mirror of
https://github.com/e107inc/e107.git
synced 2025-08-01 20:30:39 +02:00
Fixes #782 - Missing extended fields on usersettings page when using Bootstrap 2 theme.
This commit is contained in:
@@ -292,7 +292,7 @@ class usersettings_shortcodes extends e_shortcode
|
||||
|
||||
$tabs = array();
|
||||
|
||||
if($parm == 'tabs')
|
||||
if($parm == 'tabs' && deftrue('BOOTSTRAP'))
|
||||
{
|
||||
$this->extendedTabs = true;
|
||||
}
|
||||
@@ -308,13 +308,13 @@ class usersettings_shortcodes extends e_shortcode
|
||||
}
|
||||
|
||||
|
||||
if($parm == 'tabs' && deftrue('BOOTSTRAP'))
|
||||
|
||||
if($parm == 'tabs' && deftrue('BOOTSTRAP')===3)
|
||||
{
|
||||
return e107::getForm()->tabs($tabs);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
@@ -324,11 +324,12 @@ class usersettings_shortcodes extends e_shortcode
|
||||
{
|
||||
global $usersettings_shortcodes, $USER_EXTENDED_CAT, $extended_showed;
|
||||
|
||||
if(deftrue('BOOTSTRAP'))
|
||||
if(deftrue('BOOTSTRAP')===3)
|
||||
{
|
||||
$USER_EXTENDED_CAT = e107::getCoreTemplate('usersettings','extended-category');
|
||||
}
|
||||
|
||||
|
||||
$sql = e107::getDb();
|
||||
$tp = e107::getParser();
|
||||
|
||||
@@ -389,10 +390,10 @@ class usersettings_shortcodes extends e_shortcode
|
||||
|
||||
|
||||
function sc_userextended_field($parm='')
|
||||
{
|
||||
{
|
||||
global $usersettings_shortcodes, $extended_showed, $ue, $USEREXTENDED_FIELD, $REQUIRED_FIELD;
|
||||
|
||||
if(deftrue('BOOTSTRAP'))
|
||||
if(deftrue('BOOTSTRAP')===3)
|
||||
{
|
||||
$USEREXTENDED_FIELD = e107::getCoreTemplate('usersettings','extended-field');
|
||||
}
|
||||
|
@@ -181,7 +181,7 @@ $USERSETTINGS_EDIT = "
|
||||
|
||||
|
||||
|
||||
// e107 v2. bootstrap3 compatible.
|
||||
// e107 v2. bootstrap3 compatible template.
|
||||
|
||||
$USERSETTINGS_WRAPPER['edit']['USERNAME'] = "<div class='form-group'>
|
||||
<label for='username' class='col-sm-3 control-label'>".LAN_USER_01."</label>
|
||||
@@ -246,7 +246,7 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "<div class='form-group'>
|
||||
|
||||
|
||||
|
||||
|
||||
// Bootstrap 3 only.
|
||||
|
||||
$USERSETTINGS_TEMPLATE['edit'] = "
|
||||
|
||||
|
@@ -688,7 +688,7 @@ class e107_user_extended
|
||||
{
|
||||
case EUF_TEXT : //textbox
|
||||
case EUF_INTEGER : //integer
|
||||
$ret = "<input id='{$fid}' name='{$fname}' value='{$curval}' {$include} {$required} />";
|
||||
$ret = "<input id='{$fid}' type='text' name='{$fname}' value='{$curval}' {$include} {$required} />";
|
||||
|
||||
return $ret;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user