From: Jan Schneider <jan@horde.org>
Date: Thu, 24 Jun 2010 16:20:03 +0000 (+0200)
Subject: Really default to return the horde id.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=54de15c30ce1c32aba995f20144dabb9f5a2733e;p=horde.git

Really default to return the horde id.
---

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index c321a233b..44ff9984a 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -1795,19 +1795,20 @@ class Horde_Registry
     /**
      * Returns the currently logged in user, if there is one.
      *
-     * @param string $format  The return format:
-     * <pre>
-     * 'bare' - Horde ID without any domain information (e.g., foo@example.com
-     *          would be returned as 'foo').
-     * 'default' - [DEFAULT] The unique Horde ID.
-     * 'domain' - Domain of the Horde ID (e.g., foo@example.com would be
-     *            returned as 'example.com').
-     * 'original' - The username used to originally login to Horde.
-     * </pre>
+     * @param string $format  The return format, defaults to the unique Horde
+     *                        ID. Alternative formats:
+     *                        - bare: Horde ID without any domain information
+     *                          (e.g., foo@example.com would be returned as
+     *                          'foo').
+     *                        - domain: Domain of the Horde ID (e.g.,
+     *                          foo@example.com would be returned as
+     *                          'example.com').
+     *                        - original: The username used to originally login
+     *                          to Horde.
      *
      * @return mixed  The user ID or false if no user is logged in.
      */
-    public function getAuth($format = 'default')
+    public function getAuth($format = null)
     {
         if ($format == 'original') {
             return empty($_SESSION['horde_auth']['authId'])
@@ -1832,7 +1833,7 @@ class Horde_Registry
                 ? false
                 : substr($user, $pos + 1);
 
-        case 'default':
+        default:
             return $user;
         }
     }
diff --git a/kronolith/scripts/upgrades/2009-12-11_fix_column_names.pgsql.sql b/kronolith/scripts/upgrades/2009-12-11_fix_column_names.pgsql.sql
new file mode 100644
index 000000000..ee2fe45bc
--- /dev/null
+++ b/kronolith/scripts/upgrades/2009-12-11_fix_column_names.pgsql.sql
@@ -0,0 +1,2 @@
+ALTER TABLE kronolith_events_geo RENAME lat TO event_lat;
+ALTER TABLE kronolith_events_geo RENAME lon TO event_lon;