Default to NOT ask for current location for new users

It may be a bad experience for new users to immediately when trying
out the service be asked for their geographical position. Instead,
let them opt-in for this behaviour.

diff --git a/classes/User.php b/classes/User.php
index e8aaaf6a103c47d1d26a420a59b08b3354b2a67d..75a600578a8867eb0ea56e1510ac3fd3b2d77bde 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -874,13 +874,12 @@ class User extends Managed_DataObject
         } else if ($cfg == 'never') {
             return false;
         } else { // user
-            $share = true;
+            $share = common_config('location', 'sharedefault');
 
+            // Check if user has a personal setting for this
             $prefs = User_location_prefs::staticGet('user_id', $this->id);
 
-            if (empty($prefs)) {
-                $share = common_config('location', 'sharedefault');
-            } else {
+            if (!empty($prefs)) {
                 $share = $prefs->share_location;
                 $prefs->free();
             }

diff --git a/lib/default.php b/lib/default.php
index 82ffe80a5db4a51d678950d04a4861a94c756233..b7e625ca2287a0b73be4f7b237a5026408950786 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -294,7 +294,7 @@ $default =
         array('contentlimit' => null),
         'location' =>
         array('share' => 'user', // whether to share location; 'always', 'user', 'never'
-              'sharedefault' => true),
+              'sharedefault' => false),
         'omb' =>
         array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates
         'logincommand' =>