Merge remote branch 'origin/platal-1.0.0' into platal-1.0.1

[platal.git] / plugins / function.profile.php

diff --git a/plugins/function.profile.php b/plugins/function.profile.php
index 77909bd..3a05b61 100644 (file)
--- a/plugins/function.profile.php
+++ b/plugins/function.profile.php
@@ -22,21 +22,26 @@
 function smarty_function_profile($params, &$smarty)
 {
     $params = new PlDict($params);
-    $with_promo = $params->b('promo', false);
+    $with_promo = $params->b('promo', false) || $params->b('cat', false);
     $with_sex   = $params->b('sex', true);
     $with_link  = $params->b('link', true);
+    $with_dir   = $params->b('directory', true);
     $with_groupperms = $params->b('groupperms', true);
     $user = $params->v('user');
     if (is_int($user) || ctype_digit($user)) {
         $user = User::getWithUID($user);
     }
 
-    $name = pl_entities($user->directoryName());
+    if ($with_dir) {
+        $name = pl_entities($user->directoryName());
+    } else {
+        $name = pl_entities($user->fullName());
+    }
     if ($with_sex && $user->isFemale()) {
         $name = '•' . $name;
     }
     if ($with_promo) {
-        $promo = $user->promo();
+        $promo = $user->category();
         if ($promo) {
             $name .= ' (' . pl_entities($promo) . ')';
         }