Do not save latitudes and longitudes for empty addresses.

[platal.git] / classes / user.php

diff --git a/classes/user.php b/classes/user.php
index 801fe39..7ede56b 100644 (file)
--- a/classes/user.php
+++ b/classes/user.php
@@ -292,6 +292,14 @@ class User extends PlUser
         return $this->profile()->fullName($with_promo);
     }
 
+    public function shortName($with_promo = false)
+    {
+        if (!$this->hasProfile()) {
+            return $this->full_name;
+        }
+        return $this->profile()->shortName($with_promo);
+    }
+
     public function directoryName()
     {
         if (!$this->hasProfile()) {
@@ -300,6 +308,11 @@ class User extends PlUser
         return $this->profile()->directory_name;
     }
 
+    static public function compareDirectoryName($a, $b)
+    {
+        return strcasecmp(replace_accent($a->directoryName()), replace_accent($b->directoryName()));
+    }
+
     /** Return the main profile attached with this account if any.
      */
     public function profile($forceFetch = false, $fields = 0x0000, $visibility = null)
@@ -764,7 +777,7 @@ class User extends PlUser
                              $this->forlifeEmail(), $newuser->id());
 
                 // Reftech new user so its forlifeEmail will be correct.
-                $newuser = getSilentWithUID($newuser->id());
+                $newuser = self::getSilentWithUID($newuser->id());
             }
 
             // Change email used in mailing lists.