Code cleaning

taiwen · Aug 30, 2014 · 410c43d · 410c43d
1 parent 7e417b8
commit 410c43d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/usr/module/user/src/Api/Nav.php b/usr/module/user/src/Api/Nav.php
@@ -87,6 +87,5 @@ public function getList($cur, $uid = 0)
         }
 
         return $result;
-
     }
 }
diff --git a/usr/module/user/src/Controller/Front/ActivityController.php b/usr/module/user/src/Controller/Front/ActivityController.php
@@ -120,7 +120,6 @@ public function indexAction()
             //'quicklink' => $quicklink,
             //'owner'     => $isOwner,
         ));
-
     }
 
     /**

diff --git a/usr/module/user/src/Controller/Front/ProfileController.php b/usr/module/user/src/Controller/Front/ProfileController.php
@@ -539,6 +539,9 @@ protected function getProfile($uid)
                 $fields = Pi::registry('display_field', 'user')->read($gid);
                 $list   = array();
                 foreach ($fields as $field) {
+                    if (!isset($meta[$field]['title'])) {
+                        continue;
+                    }
                     $list[$field] = array(
                         'title' => $meta[$field]['title'],
                         'value' => isset($profile[$field]) ? $profile[$field] : '',

diff --git a/usr/module/user/src/Registry/Activity.php b/usr/module/user/src/Registry/Activity.php
@@ -38,7 +38,7 @@ protected function loadDynamic($options = array())
             $list[$row['name']] =  array(
                 'title'         => $row['title'],
                 'description'   => $row['description'],
-                //'module'        => $row['module'],
+                'module'        => $row['module'],
                 'icon'          => $row['icon'],
                 'callback'      => $row['callback'],
                 'template'      => $row['template']

diff --git a/usr/module/user/template/front/profile-topbar.phtml b/usr/module/user/template/front/profile-topbar.phtml
@@ -24,6 +24,11 @@ if (!$user) {
     return;
 }
 
+// Check if the current visitor is owner of the user
+if (!isset($owner)) {
+    $owner = !_get('uid') && $uid ? true : false;
+}
+
 // Load nav
 if ($owner) {
     $nav = Pi::api('nav', 'user')->getList($name);
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,5 @@ public function getList($cur, $uid = 0) @@
             }
             return $result;
         }
     }