Merge pull request #1513 from koreus/patch1

Subforum not expanding
XOOPS · Feb 4, 2025 · e5dcef8 · e5dcef8
2 parents cd5b2de + 20b746f
commit e5dcef8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/htdocs/modules/profile/edituser.php b/htdocs/modules/profile/edituser.php
@@ -82,7 +82,7 @@
         } else {
             $profile->setVar('profile_id', $edituser->getVar('uid'));
             $profile_handler->insert($profile);
-            unset($_SESSION['xoopsUserTheme']);
+            $_SESSION['xoopsUserTheme']=$edituser->getVar('theme');
             redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/userinfo.php?uid=' . $edituser->getVar('uid'), 2, _US_PROFUPDATED);
         }
     }

diff --git a/htdocs/themes/xbootstrap5/modules/newbb/newbb_index.tpl b/htdocs/themes/xbootstrap5/modules/newbb/newbb_index.tpl
@@ -123,7 +123,7 @@
                     <{/if}>
                 </div><!-- .panel-heading -->
 
-                <div id="<{$category.cat_element_id}>" class="panel-collapse collapse <{if $subforum_display == 'expand'}>in<{/if}>">
+                <div id="<{$category.cat_element_id}>" class="panel-collapse collapse <{if $subforum_display == 'expand'}>show<{/if}>">
                     <div class="panel-body">
                         <{if $category.forums}>
                             <div class="row hidden-xs">
@@ -140,7 +140,7 @@
                         <{foreach item=forum from=$category.forums|default:null}>
                         <div class="row newbb-list-foruns mb10">
                             <div class="col-sm-6 col-md-6">
-                                <{if $forum.subforum}>
+                                <{if !empty($forum.subforum)}>
                                     <div class="<{if $forum.forum_read == 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
                                         <{$forum.forum_folder}>
                                     </div>
@@ -161,7 +161,7 @@
                                     </a>
                                 <{/if}>
                                 <!-- Forum description -->
-                                <{if $forum.forum_desc|default:'' != ''}>
+                                <{if !empty($forum.forum_desc)}>
                                     <button class="btn btn-primary btn-xs pull-right" data-bs-toggle="modal" data-bs-target="#forumDesc-<{$forum.forum_id}>"><span
                                                 class="fa fa-info-sign"></span></button>
                                     <div class="modal fade" id="forumDesc-<{$forum.forum_id}>" tabindex="-1" role="dialog" aria-labelledby="ForumDescription"
@@ -221,7 +221,7 @@
                                     <{$smarty.const._MD_NEWBB_NOTOPIC}>
                                 <{/if}>
 
-                                <{if $forum.subforum}>
+                                <{if !empty($forum.subforum)}>
                                     <{$smarty.const._MD_NEWBB_SUBFORUMS}><{$img_subforum}>
                                     <{foreach item=subforum from=$forum.subforum|default:null}>
                                     [