{"action":"created","comment":{"url":"https://api.github.com/repos/friendica/friendica/pulls/comments/223214441","pull_request_review_id":162291138,"id":223214441,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIyMzIxNDQ0MQ==","diff_hunk":"@@ -635,15 +636,15 @@ function contacts_content(App $a, $update = 0)\n \t\t\t'$follow_text' => $follow_text,\n \t\t\t'$profile_select' => $profile_select,\n \t\t\t'$contact_id' => $contact['id'],\n-\t\t\t'$block_text' => ($contact['blocked'] ? L10n::t('Unblock') : L10n::t('Block')),\n-\t\t\t'$ignore_text' => ($contact['readonly'] ? L10n::t('Unignore') : L10n::t('Ignore')),\n-\t\t\t'$insecure' => (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]) ? '' : $insecure),\n+\t\t\t'$block_text' => (($contact['blocked']) ? L10n::t('Unblock') : L10n::t('Block') ),","path":"mod/contacts.php","position":44,"original_position":44,"commit_id":"67549907914c0bca27a4d6df702d962299864bfc","original_commit_id":"67549907914c0bca27a4d6df702d962299864bfc","user":{"login":"MrPetovan","id":925415,"node_id":"MDQ6VXNlcjkyNTQxNQ==","avatar_url":"https://avatars1.githubusercontent.com/u/925415?v=4","gravatar_id":"","url":"https://api.github.com/users/MrPetovan","html_url":"https://github.com/MrPetovan","followers_url":"https://api.github.com/users/MrPetovan/followers","following_url":"https://api.github.com/users/MrPetovan/following{/other_user}","gists_url":"https://api.github.com/users/MrPetovan/gists{/gist_id}","starred_url":"https://api.github.com/users/MrPetovan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MrPetovan/subscriptions","organizations_url":"https://api.github.com/users/MrPetovan/orgs","repos_url":"https://api.github.com/users/MrPetovan/repos","events_url":"https://api.github.com/users/MrPetovan/events{/privacy}","received_events_url":"https://api.github.com/users/MrPetovan/received_events","type":"User","site_admin":false},"body":"Indeed, you're reverting recent changes by Michael. This means your `issue_login_redirect` needs to be rebased onto `develop`. Here's how in your Friendica folder: \r\n```\r\ngit fetch --all\r\ngit rebase friendica/develop issue_login_redirect\r\ngit push --force\r\n```","created_at":"2018-10-07T13:54:36Z","updated_at":"2018-10-07T13:54:36Z","html_url":"https://github.com/friendica/friendica/pull/5852#discussion_r223214441","pull_request_url":"https://api.github.com/repos/friendica/friendica/pulls/5852","author_association":"COLLABORATOR","_links":{"self":{"href":"https://api.github.com/repos/friendica/friendica/pulls/comments/223214441"},"html":{"href":"https://github.com/friendica/friendica/pull/5852#discussion_r223214441"},"pull_request":{"href":"https://api.github.com/repos/friendica/friendica/pulls/5852"}},"in_reply_to_id":223214370},"pull_request":{"url":"https://api.github.com/repos/friendica/friendica/pulls/5852","id":220948828,"node_id":"MDExOlB1bGxSZXF1ZXN0MjIwOTQ4ODI4","html_url":"https://github.com/friendica/friendica/pull/5852","diff_url":"https://github.com/friendica/friendica/pull/5852.diff","patch_url":"https://github.com/friendica/friendica/pull/5852.patch","issue_url":"https://api.github.com/repos/friendica/friendica/issues/5852","number":5852,"state":"open","locked":false,"title":"Issue login redirect","user":{"login":"JonnyTischbein","id":10757520,"node_id":"MDQ6VXNlcjEwNzU3NTIw","avatar_url":"https://avatars0.githubusercontent.com/u/10757520?v=4","gravatar_id":"","url":"https://api.github.com/users/JonnyTischbein","html_url":"https://github.com/JonnyTischbein","followers_url":"https://api.github.com/users/JonnyTischbein/followers","following_url":"https://api.github.com/users/JonnyTischbein/following{/other_user}","gists_url":"https://api.github.com/users/JonnyTischbein/gists{/gist_id}","starred_url":"https://api.github.com/users/JonnyTischbein/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JonnyTischbein/subscriptions","organizations_url":"https://api.github.com/users/JonnyTischbein/orgs","repos_url":"https://api.github.com/users/JonnyTischbein/repos","events_url":"https://api.github.com/users/JonnyTischbein/events{/privacy}","received_events_url":"https://api.github.com/users/JonnyTischbein/received_events","type":"User","site_admin":false},"body":"To issue #5818 I fixed former unset `$_SESSION['return_url']` so if you access a site without logged in you will be redirected to this page after a successful login.\r\nIf a login failed you are redirected to `/login` and after successful login here to `/network`.\r\n\r\nI added the login mask in many pages (like it was did in `/admin` and `/network`). Did I miss pages ?\r\n\r\nFor more information see https://github.com/friendica/friendica/issues/5818#issuecomment-427462884","created_at":"2018-10-07T13:42:18Z","updated_at":"2018-10-07T13:54:36Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8b188ea7a3fa98e108ecb47bf1b93acbb0ef4cd5","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/friendica/friendica/pulls/5852/commits","review_comments_url":"https://api.github.com/repos/friendica/friendica/pulls/5852/comments","review_comment_url":"https://api.github.com/repos/friendica/friendica/pulls/comments{/number}","comments_url":"https://api.github.com/repos/friendica/friendica/issues/5852/comments","statuses_url":"https://api.github.com/repos/friendica/friendica/statuses/67549907914c0bca27a4d6df702d962299864bfc","head":{"label":"JonnyTischbein:issue_login_redirect","ref":"issue_login_redirect","sha":"67549907914c0bca27a4d6df702d962299864bfc","user":{"login":"JonnyTischbein","id":10757520,"node_id":"MDQ6VXNlcjEwNzU3NTIw","avatar_url":"https://avatars0.githubusercontent.com/u/10757520?v=4","gravatar_id":"","url":"https://api.github.com/users/JonnyTischbein","html_url":"https://github.com/JonnyTischbein","followers_url":"https://api.github.com/users/JonnyTischbein/followers","following_url":"https://api.github.com/users/JonnyTischbein/following{/other_user}","gists_url":"https://api.github.com/users/JonnyTischbein/gists{/gist_id}","starred_url":"https://api.github.com/users/JonnyTischbein/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JonnyTischbein/subscriptions","organizations_url":"https://api.github.com/users/JonnyTischbein/orgs","repos_url":"https://api.github.com/users/JonnyTischbein/repos","events_url":"https://api.github.com/users/JonnyTischbein/events{/privacy}","received_events_url":"https://api.github.com/users/JonnyTischbein/received_events","type":"User","site_admin":false},"repo":{"id":148202444,"node_id":"MDEwOlJlcG9zaXRvcnkxNDgyMDI0NDQ=","name":"friendica","full_name":"JonnyTischbein/friendica","private":false,"owner":{"login":"JonnyTischbein","id":10757520,"node_id":"MDQ6VXNlcjEwNzU3NTIw","avatar_url":"https://avatars0.githubusercontent.com/u/10757520?v=4","gravatar_id":"","url":"https://api.github.com/users/JonnyTischbein","html_url":"https://github.com/JonnyTischbein","followers_url":"https://api.github.com/users/JonnyTischbein/followers","following_url":"https://api.github.com/users/JonnyTischbein/following{/other_user}","gists_url":"https://api.github.com/users/JonnyTischbein/gists{/gist_id}","starred_url":"https://api.github.com/users/JonnyTischbein/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JonnyTischbein/subscriptions","organizations_url":"https://api.github.com/users/JonnyTischbein/orgs","repos_url":"https://api.github.com/users/JonnyTischbein/repos","events_url":"https://api.github.com/users/JonnyTischbein/events{/privacy}","received_events_url":"https://api.github.com/users/JonnyTischbein/received_events","type":"User","site_admin":false},"html_url":"https://github.com/JonnyTischbein/friendica","description":"Friendica Communications Platform","fork":true,"url":"https://api.github.com/repos/JonnyTischbein/friendica","forks_url":"https://api.github.com/repos/JonnyTischbein/friendica/forks","keys_url":"https://api.github.com/repos/JonnyTischbein/friendica/keys{/key_id}","collaborators_url":"https://api.github.com/repos/JonnyTischbein/friendica/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/JonnyTischbein/friendica/teams","hooks_url":"https://api.github.com/repos/JonnyTischbein/friendica/hooks","issue_events_url":"https://api.github.com/repos/JonnyTischbein/friendica/issues/events{/number}","events_url":"https://api.github.com/repos/JonnyTischbein/friendica/events","assignees_url":"https://api.github.com/repos/JonnyTischbein/friendica/assignees{/user}","branches_url":"https://api.github.com/repos/JonnyTischbein/friendica/branches{/branch}","tags_url":"https://api.github.com/repos/JonnyTischbein/friendica/tags","blobs_url":"https://api.github.com/repos/JonnyTischbein/friendica/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/JonnyTischbein/friendica/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/JonnyTischbein/friendica/git/refs{/sha}","trees_url":"https://api.github.com/repos/JonnyTischbein/friendica/git/trees{/sha}","statuses_url":"https://api.github.com/repos/JonnyTischbein/friendica/statuses/{sha}","languages_url":"https://api.github.com/repos/JonnyTischbein/friendica/languages","stargazers_url":"https://api.github.com/repos/JonnyTischbein/friendica/stargazers","contributors_url":"https://api.github.com/repos/JonnyTischbein/friendica/contributors","subscribers_url":"https://api.github.com/repos/JonnyTischbein/friendica/subscribers","subscription_url":"https://api.github.com/repos/JonnyTischbein/friendica/subscription","commits_url":"https://api.github.com/repos/JonnyTischbein/friendica/commits{/sha}","git_commits_url":"https://api.github.com/repos/JonnyTischbein/friendica/git/commits{/sha}","comments_url":"https://api.github.com/repos/JonnyTischbein/friendica/comments{/number}","issue_comment_url":"https://api.github.com/repos/JonnyTischbein/friendica/issues/comments{/number}","contents_url":"https://api.github.com/repos/JonnyTischbein/friendica/contents/{+path}","compare_url":"https://api.github.com/repos/JonnyTischbein/friendica/compare/{base}...{head}","merges_url":"https://api.github.com/repos/JonnyTischbein/friendica/merges","archive_url":"https://api.github.com/repos/JonnyTischbein/friendica/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/JonnyTischbein/friendica/downloads","issues_url":"https://api.github.com/repos/JonnyTischbein/friendica/issues{/number}","pulls_url":"https://api.github.com/repos/JonnyTischbein/friendica/pulls{/number}","milestones_url":"https://api.github.com/repos/JonnyTischbein/friendica/milestones{/number}","notifications_url":"https://api.github.com/repos/JonnyTischbein/friendica/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/JonnyTischbein/friendica/labels{/name}","releases_url":"https://api.github.com/repos/JonnyTischbein/friendica/releases{/id}","deployments_url":"https://api.github.com/repos/JonnyTischbein/friendica/deployments","created_at":"2018-09-10T18:42:07Z","updated_at":"2018-10-07T13:53:11Z","pushed_at":"2018-10-07T13:53:24Z","git_url":"git://github.com/JonnyTischbein/friendica.git","ssh_url":"git@github.com:JonnyTischbein/friendica.git","clone_url":"https://github.com/JonnyTischbein/friendica.git","svn_url":"https://github.com/JonnyTischbein/friendica","homepage":"https://friendi.ca","size":106013,"stargazers_count":1,"watchers_count":1,"language":"PHP","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"NOASSERTION","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":1,"default_branch":"develop"}},"base":{"label":"friendica:develop","ref":"develop","sha":"772d735f124957b000fe8c07d0238c04195695ea","user":{"login":"friendica","id":1176581,"node_id":"MDQ6VXNlcjExNzY1ODE=","avatar_url":"https://avatars1.githubusercontent.com/u/1176581?v=4","gravatar_id":"","url":"https://api.github.com/users/friendica","html_url":"https://github.com/friendica","followers_url":"https://api.github.com/users/friendica/followers","following_url":"https://api.github.com/users/friendica/following{/other_user}","gists_url":"https://api.github.com/users/friendica/gists{/gist_id}","starred_url":"https://api.github.com/users/friendica/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/friendica/subscriptions","organizations_url":"https://api.github.com/users/friendica/orgs","repos_url":"https://api.github.com/users/friendica/repos","events_url":"https://api.github.com/users/friendica/events{/privacy}","received_events_url":"https://api.github.com/users/friendica/received_events","type":"User","site_admin":false},"repo":{"id":2722709,"node_id":"MDEwOlJlcG9zaXRvcnkyNzIyNzA5","name":"friendica","full_name":"friendica/friendica","private":false,"owner":{"login":"friendica","id":1176581,"node_id":"MDQ6VXNlcjExNzY1ODE=","avatar_url":"https://avatars1.githubusercontent.com/u/1176581?v=4","gravatar_id":"","url":"https://api.github.com/users/friendica","html_url":"https://github.com/friendica","followers_url":"https://api.github.com/users/friendica/followers","following_url":"https://api.github.com/users/friendica/following{/other_user}","gists_url":"https://api.github.com/users/friendica/gists{/gist_id}","starred_url":"https://api.github.com/users/friendica/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/friendica/subscriptions","organizations_url":"https://api.github.com/users/friendica/orgs","repos_url":"https://api.github.com/users/friendica/repos","events_url":"https://api.github.com/users/friendica/events{/privacy}","received_events_url":"https://api.github.com/users/friendica/received_events","type":"User","site_admin":false},"html_url":"https://github.com/friendica/friendica","description":"Friendica Communications Platform","fork":true,"url":"https://api.github.com/repos/friendica/friendica","forks_url":"https://api.github.com/repos/friendica/friendica/forks","keys_url":"https://api.github.com/repos/friendica/friendica/keys{/key_id}","collaborators_url":"https://api.github.com/repos/friendica/friendica/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/friendica/friendica/teams","hooks_url":"https://api.github.com/repos/friendica/friendica/hooks","issue_events_url":"https://api.github.com/repos/friendica/friendica/issues/events{/number}","events_url":"https://api.github.com/repos/friendica/friendica/events","assignees_url":"https://api.github.com/repos/friendica/friendica/assignees{/user}","branches_url":"https://api.github.com/repos/friendica/friendica/branches{/branch}","tags_url":"https://api.github.com/repos/friendica/friendica/tags","blobs_url":"https://api.github.com/repos/friendica/friendica/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/friendica/friendica/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/friendica/friendica/git/refs{/sha}","trees_url":"https://api.github.com/repos/friendica/friendica/git/trees{/sha}","statuses_url":"https://api.github.com/repos/friendica/friendica/statuses/{sha}","languages_url":"https://api.github.com/repos/friendica/friendica/languages","stargazers_url":"https://api.github.com/repos/friendica/friendica/stargazers","contributors_url":"https://api.github.com/repos/friendica/friendica/contributors","subscribers_url":"https://api.github.com/repos/friendica/friendica/subscribers","subscription_url":"https://api.github.com/repos/friendica/friendica/subscription","commits_url":"https://api.github.com/repos/friendica/friendica/commits{/sha}","git_commits_url":"https://api.github.com/repos/friendica/friendica/git/commits{/sha}","comments_url":"https://api.github.com/repos/friendica/friendica/comments{/number}","issue_comment_url":"https://api.github.com/repos/friendica/friendica/issues/comments{/number}","contents_url":"https://api.github.com/repos/friendica/friendica/contents/{+path}","compare_url":"https://api.github.com/repos/friendica/friendica/compare/{base}...{head}","merges_url":"https://api.github.com/repos/friendica/friendica/merges","archive_url":"https://api.github.com/repos/friendica/friendica/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/friendica/friendica/downloads","issues_url":"https://api.github.com/repos/friendica/friendica/issues{/number}","pulls_url":"https://api.github.com/repos/friendica/friendica/pulls{/number}","milestones_url":"https://api.github.com/repos/friendica/friendica/milestones{/number}","notifications_url":"https://api.github.com/repos/friendica/friendica/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/friendica/friendica/labels{/name}","releases_url":"https://api.github.com/repos/friendica/friendica/releases{/id}","deployments_url":"https://api.github.com/repos/friendica/friendica/deployments","created_at":"2011-11-06T22:19:41Z","updated_at":"2018-10-07T12:58:26Z","pushed_at":"2018-10-07T13:42:19Z","git_url":"git://github.com/friendica/friendica.git","ssh_url":"git@github.com:friendica/friendica.git","clone_url":"https://github.com/friendica/friendica.git","svn_url":"https://github.com/friendica/friendica","homepage":"https://friendi.ca","size":106034,"stargazers_count":642,"watchers_count":642,"language":"PHP","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":210,"mirror_url":null,"archived":false,"open_issues_count":402,"license":{"key":"other","name":"NOASSERTION","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":210,"open_issues":402,"watchers":642,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/friendica/friendica/pulls/5852"},"html":{"href":"https://github.com/friendica/friendica/pull/5852"},"issue":{"href":"https://api.github.com/repos/friendica/friendica/issues/5852"},"comments":{"href":"https://api.github.com/repos/friendica/friendica/issues/5852/comments"},"review_comments":{"href":"https://api.github.com/repos/friendica/friendica/pulls/5852/comments"},"review_comment":{"href":"https://api.github.com/repos/friendica/friendica/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/friendica/friendica/pulls/5852/commits"},"statuses":{"href":"https://api.github.com/repos/friendica/friendica/statuses/67549907914c0bca27a4d6df702d962299864bfc"}},"author_association":"NONE"}}
{"actor":{"display_login":"MrPetovan"}}