Move Photo module, update Photo model

[friendica.git] / src / Model / Group.php

diff --git a/src/Model/Group.php b/src/Model/Group.php
index b32b61e103036659e17956ac04f8cd6a1988ec07..9a4fc23407b28e3d65a7e74fe3aab386fcaf349b 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -12,10 +12,6 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Util\Security;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 /**
  * @brief functions for interacting with the group database table
  */
@@ -33,7 +29,7 @@ class Group extends BaseObject
        public static function create($uid, $name)
        {
                $return = false;
-               if (x($uid) && x($name)) {
+               if (!empty($uid) && !empty($name)) {
                        $gid = self::getIdByName($uid, $name); // check for dupes
                        if ($gid !== false) {
                                // This could be a problem.
@@ -202,7 +198,7 @@ class Group extends BaseObject
         */
        public static function removeByName($uid, $name) {
                $return = false;
-               if (x($uid) && x($name)) {
+               if (!empty($uid) && !empty($name)) {
                        $gid = self::getIdByName($uid, $name);
 
                        $return = self::remove($gid);
@@ -400,6 +396,11 @@ class Group extends BaseObject
                        ];
                }
 
+               // Don't show the groups on the network page when there is only one
+               if ((count($display_groups) <= 2) && ($each == 'network')) {
+                       return '';
+               }
+
                $tpl = Renderer::getMarkupTemplate('group_side.tpl');
                $o = Renderer::replaceMacros($tpl, [
                        '$add' => L10n::t('add'),