Display teams at the right place

Separate comments only by one BR Unnecessary return instruction.
pydio · Nov 15, 2013 · c9a1906 · c9a1906
1 parent e9809f5
commit c9a1906
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/core/src/plugins/access.fs/class.fsAccessDriver.php b/core/src/plugins/access.fs/class.fsAccessDriver.php
@@ -920,7 +920,6 @@ public function switchAction($action, $httpVars, $fileVars)
                 $this->logDebug("LS Time : ".intval((microtime()-$startTime)*1000)."ms");
 
                 AJXP_XMLWriter::close();
-                return ;
 
             break;
         }

diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -913,12 +913,6 @@ public function switchAction($action, $httpVars, $fileVars)
                 }
                 $users = "";
                 $index = 0;
-                if (method_exists($this, "listUserTeams")) {
-                    $teams = $this->listUserTeams();
-                    foreach ($teams as $tId => $tData) {
-                        $users.= "<li class='complete_group_entry' data-group='/AJXP_TEAM/$tId' data-label='[team] ".$tData["LABEL"]."'><span class='user_entry_label'>[team] ".$tData["LABEL"]."</span></li>";
-                    }
-                }
                 if ($regexp != null && (!count($allUsers) || !array_key_exists($crtValue, $allUsers))  && ConfService::getCoreConf("USER_CREATE_USERS", "conf") && !$existingOnly) {
                     $users .= "<li class='complete_user_entry_temp' data-temporary='true' data-label='$crtValue'><span class='user_entry_label'>$crtValue (".$mess["448"].")</span></li>";
                 } else if ($existingOnly && !empty($crtValue)) {
@@ -928,13 +922,19 @@ public function switchAction($action, $httpVars, $fileVars)
                 if ($regexp == null && !$usersOnly) {
                     $users .= "<li class='complete_group_entry' data-group='/' data-label='".$mess["447"]."'><span class='user_entry_label'>".$mess["447"]."</span></li>";
                 }
-                if (!$usersOnly && count($allGroups)) {
+                if (!$usersOnly) {
                     foreach ($allGroups as $groupId => $groupLabel) {
                         if ($regexp == null ||  preg_match("/$regexp/i", $groupLabel)) {
                             $users .= "<li class='complete_group_entry' data-group='$groupId' data-label='$groupLabel' data-entry_id='$groupId'><span class='user_entry_label'>".$groupLabel."</span></li>";
                         }
                     }
                 }
+                if ($regexp == null && method_exists($this, "listUserTeams")) {
+                    $teams = $this->listUserTeams();
+                    foreach ($teams as $tId => $tData) {
+                        $users.= "<li class='complete_group_entry' data-group='/AJXP_TEAM/$tId' data-label='[team] ".$tData["LABEL"]."'><span class='user_entry_label'>[team] ".$tData["LABEL"]."</span></li>";
+                    }
+                }
                 foreach ($allUsers as $userId => $userObject) {
                     if($userObject->getId() == $loggedUser->getId()) continue;
                     if ( ( !$userObject->hasParent() &&  ConfService::getCoreConf("ALLOW_CROSSUSERS_SHARING", "conf")) || $userObject->getParent() == $loggedUser->getId() ) {

diff --git a/core/src/plugins/meta.comments/class.CommentsMetaManager.php b/core/src/plugins/meta.comments/class.CommentsMetaManager.php
@@ -156,7 +156,7 @@ public function switchActions($actionName, $httpVars, $fileVars)
                             "rpath"     => $rPath
                         );
                         if (isSet($previous) && $previous["author"] == $newItem["author"] &&  $previous["path"] == $newItem["path"] && $previous["hdate"] == $newItem["hdate"] ) {
-                            $theFeed[count($theFeed) - 1]["content"].= '<br>--<br>'.$newItem["content"];
+                            $theFeed[count($theFeed) - 1]["content"].= '<br>'.$newItem["content"];
 
                         } else {
                             $theFeed[] = $newItem;