forked from GNUsocial/gnu-social
		
	Make sure we save 0 as '0' because of DB_DataObject bug
This commit is contained in:
		@@ -82,8 +82,8 @@ class ProfilesettingsAction extends SettingsAction
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    function showContent()
 | 
					    function showContent()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $user = common_current_user();
 | 
					        $profile = $this->scoped;
 | 
				
			||||||
        $profile = $user->getProfile();
 | 
					        $user = $this->scoped->getUser();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $this->elementStart('form', array('method' => 'post',
 | 
					        $this->elementStart('form', array('method' => 'post',
 | 
				
			||||||
                                          'id' => 'form_settings_profile',
 | 
					                                          'id' => 'form_settings_profile',
 | 
				
			||||||
@@ -260,9 +260,9 @@ class ProfilesettingsAction extends SettingsAction
 | 
				
			|||||||
            $homepage = $this->trimmed('homepage');
 | 
					            $homepage = $this->trimmed('homepage');
 | 
				
			||||||
            $bio = $this->trimmed('bio');
 | 
					            $bio = $this->trimmed('bio');
 | 
				
			||||||
            $location = $this->trimmed('location');
 | 
					            $location = $this->trimmed('location');
 | 
				
			||||||
            $autosubscribe = $this->boolean('autosubscribe');
 | 
					            $autosubscribe = $this->booleanintstring('autosubscribe');
 | 
				
			||||||
            $subscribe_policy = $this->trimmed('subscribe_policy');
 | 
					            $subscribe_policy = $this->trimmed('subscribe_policy');
 | 
				
			||||||
            $private_stream = $this->boolean('private_stream');
 | 
					            $private_stream = $this->booleanintstring('private_stream');
 | 
				
			||||||
            $language = $this->trimmed('language');
 | 
					            $language = $this->trimmed('language');
 | 
				
			||||||
            $timezone = $this->trimmed('timezone');
 | 
					            $timezone = $this->trimmed('timezone');
 | 
				
			||||||
            $tagstring = $this->trimmed('tags');
 | 
					            $tagstring = $this->trimmed('tags');
 | 
				
			||||||
@@ -398,7 +398,7 @@ class ProfilesettingsAction extends SettingsAction
 | 
				
			|||||||
                    $orig = clone($prefs);
 | 
					                    $orig = clone($prefs);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                $prefs->share_location = $this->boolean('sharelocation');
 | 
					                $prefs->share_location = $this->booleanintstring('sharelocation');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if ($exists) {
 | 
					                if ($exists) {
 | 
				
			||||||
                    $result = $prefs->update($orig);
 | 
					                    $result = $prefs->update($orig);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user