Merge https://github.com/friendica/red into pending_merge

2014-06-26 16:26:33 -07:00
parent 8b545d91db 0db4b55223
commit fea4eac17a
5 changed files with 15 additions and 5 deletions
@@ -15,6 +15,8 @@ function home_init(&$a) {
 		$dest = $channel['channel_startpage'];
 		if(! $dest)
 			$dest = get_pconfig(local_user(),'system','startpage');
+		if(! $dest)
+			$dest = get_config('system','startpage');
 		if(! $dest)
 			$dest = z_root() . '/apps';