Get rid of unneeded sql queries

lib/Db/BoardMapper.php

@@ -52,18 +52,23 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
 		$board = $this->findEntity($sql, [$id]);
 
 		// Add labels
+		if ($withLabels) {
 			$labels = $this->labelMapper->findAll($id);
 			$board->setLabels($labels);
+		}
 
 		// Add acl
+		if ($withAcl) {
 			$acl = $this->aclMapper->findAll($id);
 			$board->setAcl($acl);
+		}
 
 		return $board;
 	}
 
 	/**
 	 * Find all boards for a given user
+	 *
 	 * @param $userId
 	 * @param null $limit
 	 * @param null $offset

lib/Service/CardService.php

@@ -97,7 +97,7 @@ class CardService  {
             $this->cardMapper->update($card);
         }
         // FIXME: return reordered cards without an additional db query
-        //$cards = $this->cardMapper->findAll($stackId);
+        $cards = $this->cardMapper->findAll($stackId);
         return $cards;
     }