Full profile fields reinstated on profile/details page

git-svn-id: http://code.elgg.org/elgg/trunk@5332 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/profile/index.php b/mod/profile/index.php
index 72adf08cac74a7b20a690d53b955bdcef398d52c..6d56f2c8774fe453ba519481863236808962afce 100644 (file)
--- a/mod/profile/index.php
+++ b/mod/profile/index.php
@@ -23,7 +23,7 @@ if ($user = get_user_by_username($username)) {
        $body = elgg_view('profile/profile_navigation', array("option" => $option,"entity" => $user));
        switch($option){
                case 'activity':
-                       $body .= elgg_view('profile/profile_contents/details', array("entity" => $user, "full" => true));
+                       $body .= elgg_view('profile/profile_contents/details', array("entity" => $user));
                break;
 
                case 'widgets':
@@ -42,7 +42,7 @@ if ($user = get_user_by_username($username)) {
                break;
 
                case 'default':
-                       $body .= elgg_view('profile/profile_contents/details', array("entity" => $user, "full" => true));
+                       $body .= elgg_view('profile/profile_contents/details', array("entity" => $user));
                break;
        }
        //$body .= elgg_view_entity($user,true);

diff --git a/mod/profile/views/default/profile/profile_contents/details.php b/mod/profile/views/default/profile/profile_contents/details.php
index 7c5e6a0a4f85df55d47d8123c73d0df853522542..d040cef75a257c7b8783f3ad20b581dddf65610b 100755 (executable)
--- a/mod/profile/views/default/profile/profile_contents/details.php
+++ b/mod/profile/views/default/profile/profile_contents/details.php
@@ -13,29 +13,27 @@
        else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid))
                $rel = 'friend';
 
-       if ($vars['full'] == true) {
-               $even_odd = null;
-               if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0)
-                       foreach($vars['config']->profile as $shortname => $valtype) {
-                               if ($shortname != "description") {
-                                       $value = $vars['entity']->$shortname;
-                                       if (!empty($value)) {
-                                               //This function controls the alternating class
-                                                         $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+       $even_odd = null;
+       if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0)
+               foreach($vars['config']->profile as $shortname => $valtype) {
+                       if ($shortname != "description") {
+                               $value = $vars['entity']->$shortname;
+                               if (!empty($value)) {
+                                       //This function controls the alternating class
+                                       $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 ?>
-                                               <p class="<?php echo $even_odd; ?>">
-                                               <b><?php
-                                                               echo elgg_echo("profile:{$shortname}");
-                                               ?>: </b>
-                                               <?php
-                                                       echo elgg_view("output/{$valtype}",array('value' => $vars['entity']->$shortname));
-                                               ?>
-                                               </p>
-                                               <?php
-                                       }
+                                       <p class="<?php echo $even_odd; ?>">
+                                       <b><?php
+                                                       echo elgg_echo("profile:{$shortname}");
+                                       ?>: </b>
+                                       <?php
+                                               echo elgg_view("output/{$valtype}",array('value' => $vars['entity']->$shortname));
+                                       ?>
+                                       </p>
+                                       <?php
                                }
                        }
-       }
+               }
 ?>
 <?php
        if (!get_plugin_setting('user_defined_fields', 'profile')) {