mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Fixes #782 - Missing extended fields on usersettings page when using Bootstrap 2 theme.

Browse Source
This commit is contained in:
Cameron
2014-10-15 15:38:50 -07:00
parent 26944fbbb7
commit 7a7a98cb5d
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_core/shortcodes/batch/usersettings_shortcodes.php
View File

@@ -292,7 +292,7 @@ class usersettings_shortcodes extends e_shortcode
$tabs = array(); $tabs = array();
if($parm == 'tabs') if($parm == 'tabs' && deftrue('BOOTSTRAP'))
{ {
$this->extendedTabs = true; $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 e107::getForm()->tabs($tabs);
} }
return $ret; return $ret;
} }
@@ -324,11 +324,12 @@ class usersettings_shortcodes extends e_shortcode
{ {
global $usersettings_shortcodes, $USER_EXTENDED_CAT, $extended_showed; global $usersettings_shortcodes, $USER_EXTENDED_CAT, $extended_showed;
if(deftrue('BOOTSTRAP')) if(deftrue('BOOTSTRAP')===3)
{ {
$USER_EXTENDED_CAT = e107::getCoreTemplate('usersettings','extended-category'); $USER_EXTENDED_CAT = e107::getCoreTemplate('usersettings','extended-category');
} }
$sql = e107::getDb(); $sql = e107::getDb();
$tp = e107::getParser(); $tp = e107::getParser();
@@ -392,7 +393,7 @@ class usersettings_shortcodes extends e_shortcode
{ {
global $usersettings_shortcodes, $extended_showed, $ue, $USEREXTENDED_FIELD, $REQUIRED_FIELD; global $usersettings_shortcodes, $extended_showed, $ue, $USEREXTENDED_FIELD, $REQUIRED_FIELD;
if(deftrue('BOOTSTRAP')) if(deftrue('BOOTSTRAP')===3)
{ {
$USEREXTENDED_FIELD = e107::getCoreTemplate('usersettings','extended-field'); $USEREXTENDED_FIELD = e107::getCoreTemplate('usersettings','extended-field');
} }

4
e107_core/templates/usersettings_template.php
View File

@@ -181,7 +181,7 @@ $USERSETTINGS_EDIT = "
// e107 v2. bootstrap3 compatible. // e107 v2. bootstrap3 compatible template.
$USERSETTINGS_WRAPPER['edit']['USERNAME'] = "<div class='form-group'> $USERSETTINGS_WRAPPER['edit']['USERNAME'] = "<div class='form-group'>
<label for='username' class='col-sm-3 control-label'>".LAN_USER_01."</label> <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'] = " $USERSETTINGS_TEMPLATE['edit'] = "

2
e107_handlers/user_extended_class.php
View File

@@ -688,7 +688,7 @@ class e107_user_extended
{ {
case EUF_TEXT : //textbox case EUF_TEXT : //textbox
case EUF_INTEGER : //integer 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; return $ret;
break; break;