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

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes

This commit is contained in:
Mikael Nordfeldth 2016-01-06 00:53:20 +01:00
parent 1946197a1c d45457e4a9
commit 59d3bbe037
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/Profile.php
View File

@ -822,6 +822,7 @@ class Profile extends Managed_DataObject
$notices = new Notice(); $notices = new Notice();
$notices->profile_id = $this->id; $notices->profile_id = $this->id;
$notices->verb = ActivityVerb::POST;
$cnt = (int) $notices->count('distinct id'); $cnt = (int) $notices->count('distinct id');
if (!empty($c)) { if (!empty($c)) {

2
plugins/OpenID/OpenIDPlugin.php
View File

@ -414,7 +414,7 @@ class OpenIDPlugin extends Plugin
*/ */
function onRedirectToLogin($action, $user) function onRedirectToLogin($action, $user)
{ {
if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { if (common_config('site', 'openidonly') || (!empty($user) && User_openid::hasOpenID($user->id))) {
common_redirect(common_local_url('openidlogin'), 303); common_redirect(common_local_url('openidlogin'), 303);
} }
return true; return true;