GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin

This commit is contained in:
root 2010-01-10 08:20:29 +00:00
parent d636bee4c0 e2dee5fedb
commit ef0e0116c2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/login.php
View File

@ -133,7 +133,7 @@ class LoginAction extends Action
$url = common_get_returnto();
if (common_config('ssl', 'sometimes') && // mixed environment
common_config('site', 'server') != common_config('site', 'sslserver')) {
0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) {
$this->redirectFromSSL($user, $url, $this->boolean('rememberme'));
return;
}

5
actions/register.php
View File

@ -260,8 +260,9 @@ class RegisterAction extends Action
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
if (common_config('ssl', 'sometimes') && // mixed environment
common_config('site', 'server') != common_config('site', 'sslserver')) {
if (common_config('site', 'ssl') == 'sometimes' && // mixed environment
0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) {
$url = common_local_url('all',
array('nickname' =>
$user->nickname));

6
classes/Status_network.php
View File

@ -170,7 +170,11 @@ class Status_network extends DB_DataObject
$config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
$config['site']['name'] = $sn->sitename;
$config['site']['name'] = $sn->sitename;
if (!empty($sn->hostname)) {
$config['site']['server'] = $sn->hostname;
}
if (!empty($sn->theme)) {
$config['site']['theme'] = $sn->theme;