{"action":"created","comment":{"url":"https://api.github.com/repos/civicrm/civicrm-core/pulls/comments/88309894","pull_request_review_id":8887403,"id":88309894,"diff_hunk":"@@ -130,9 +130,24 @@\n               $row.title|substr:0:5 == \"Phone\"}\n \n             <td>\n-              {* @TODO check if this is ever an array or a fileName? *}\n+\n               {* This is on one long line for address formatting *}\n-              {if $row.title|substr:0:7 == \"Address\"}<span style=\"white-space: pre\" id=\"main_{$blockName}_{$blockId}\">{else}<span id=\"main_{$blockName}_{$blockId}\">{/if}{if !is_array($row.main)}{$row.main}{elseif $row.main.fileName}{$row.main.fileName}{else}{', '|implode:$row.main}{/if}</span>\n+              {if $row.title|substr:0:7 == \"Address\"}\n+                <span style=\"white-space: pre\" id=\"main_{$blockName}_{$blockId}\">\n+              {else}\n+                <span id=\"main_{$blockName}_{$blockId}\">\n+              {/if}\n+\n+              {* @TODO check if this is ever an array or a fileName? *}\n+              {if !is_array($row.main)}\n+                {$row.main}\n+              {elseif $row.main.fileName}\n+                {$row.main.fileName}\n+              {else}\n+                {', '|implode:$row.main}\n+              {/if}\n+\n+              </span>","path":"templates/CRM/Contact/Form/Merge.tpl","position":23,"original_position":23,"commit_id":"f2e79f66bc7eb4a3328a53e8b658ef772fb3e70b","original_commit_id":"f2e79f66bc7eb4a3328a53e8b658ef772fb3e70b","user":{"login":"eileenmcnaughton","id":336308,"avatar_url":"https://avatars.githubusercontent.com/u/336308?v=3","gravatar_id":"","url":"https://api.github.com/users/eileenmcnaughton","html_url":"https://github.com/eileenmcnaughton","followers_url":"https://api.github.com/users/eileenmcnaughton/followers","following_url":"https://api.github.com/users/eileenmcnaughton/following{/other_user}","gists_url":"https://api.github.com/users/eileenmcnaughton/gists{/gist_id}","starred_url":"https://api.github.com/users/eileenmcnaughton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eileenmcnaughton/subscriptions","organizations_url":"https://api.github.com/users/eileenmcnaughton/orgs","repos_url":"https://api.github.com/users/eileenmcnaughton/repos","events_url":"https://api.github.com/users/eileenmcnaughton/events{/privacy}","received_events_url":"https://api.github.com/users/eileenmcnaughton/received_events","type":"User","site_admin":false},"body":"Ah - we can wrap that in {strip} {/strip}to deal with that","created_at":"2016-11-16T19:17:03Z","updated_at":"2016-11-16T19:17:03Z","html_url":"https://github.com/civicrm/civicrm-core/pull/9368#discussion_r88309894","pull_request_url":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368","_links":{"self":{"href":"https://api.github.com/repos/civicrm/civicrm-core/pulls/comments/88309894"},"html":{"href":"https://github.com/civicrm/civicrm-core/pull/9368#discussion_r88309894"},"pull_request":{"href":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368"}}},"pull_request":{"url":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368","id":93125254,"html_url":"https://github.com/civicrm/civicrm-core/pull/9368","diff_url":"https://github.com/civicrm/civicrm-core/pull/9368.diff","patch_url":"https://github.com/civicrm/civicrm-core/pull/9368.patch","issue_url":"https://api.github.com/repos/civicrm/civicrm-core/issues/9368","number":9368,"state":"open","locked":false,"title":"\tCRM-19492 (merge screen) disable location settings if the relevant checkbox is not enabled","user":{"login":"eileenmcnaughton","id":336308,"avatar_url":"https://avatars.githubusercontent.com/u/336308?v=3","gravatar_id":"","url":"https://api.github.com/users/eileenmcnaughton","html_url":"https://github.com/eileenmcnaughton","followers_url":"https://api.github.com/users/eileenmcnaughton/followers","following_url":"https://api.github.com/users/eileenmcnaughton/following{/other_user}","gists_url":"https://api.github.com/users/eileenmcnaughton/gists{/gist_id}","starred_url":"https://api.github.com/users/eileenmcnaughton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eileenmcnaughton/subscriptions","organizations_url":"https://api.github.com/users/eileenmcnaughton/orgs","repos_url":"https://api.github.com/users/eileenmcnaughton/repos","events_url":"https://api.github.com/users/eileenmcnaughton/events{/privacy}","received_events_url":"https://api.github.com/users/eileenmcnaughton/received_events","type":"User","site_admin":false},"body":"* [CRM-19492: When merging: require row to be taken across before changing row settings](https://issues.civicrm.org/jira/browse/CRM-19492)","created_at":"2016-11-10T10:37:48Z","updated_at":"2016-11-16T19:17:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"7eaab12f36ec9af6b613ca421edd2b1b20d0ca51","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368/commits","review_comments_url":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368/comments","review_comment_url":"https://api.github.com/repos/civicrm/civicrm-core/pulls/comments{/number}","comments_url":"https://api.github.com/repos/civicrm/civicrm-core/issues/9368/comments","statuses_url":"https://api.github.com/repos/civicrm/civicrm-core/statuses/f2e79f66bc7eb4a3328a53e8b658ef772fb3e70b","head":{"label":"eileenmcnaughton:dupe","ref":"dupe","sha":"f2e79f66bc7eb4a3328a53e8b658ef772fb3e70b","user":{"login":"eileenmcnaughton","id":336308,"avatar_url":"https://avatars.githubusercontent.com/u/336308?v=3","gravatar_id":"","url":"https://api.github.com/users/eileenmcnaughton","html_url":"https://github.com/eileenmcnaughton","followers_url":"https://api.github.com/users/eileenmcnaughton/followers","following_url":"https://api.github.com/users/eileenmcnaughton/following{/other_user}","gists_url":"https://api.github.com/users/eileenmcnaughton/gists{/gist_id}","starred_url":"https://api.github.com/users/eileenmcnaughton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eileenmcnaughton/subscriptions","organizations_url":"https://api.github.com/users/eileenmcnaughton/orgs","repos_url":"https://api.github.com/users/eileenmcnaughton/repos","events_url":"https://api.github.com/users/eileenmcnaughton/events{/privacy}","received_events_url":"https://api.github.com/users/eileenmcnaughton/received_events","type":"User","site_admin":false},"repo":{"id":8567814,"name":"civicrm-core","full_name":"eileenmcnaughton/civicrm-core","owner":{"login":"eileenmcnaughton","id":336308,"avatar_url":"https://avatars.githubusercontent.com/u/336308?v=3","gravatar_id":"","url":"https://api.github.com/users/eileenmcnaughton","html_url":"https://github.com/eileenmcnaughton","followers_url":"https://api.github.com/users/eileenmcnaughton/followers","following_url":"https://api.github.com/users/eileenmcnaughton/following{/other_user}","gists_url":"https://api.github.com/users/eileenmcnaughton/gists{/gist_id}","starred_url":"https://api.github.com/users/eileenmcnaughton/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eileenmcnaughton/subscriptions","organizations_url":"https://api.github.com/users/eileenmcnaughton/orgs","repos_url":"https://api.github.com/users/eileenmcnaughton/repos","events_url":"https://api.github.com/users/eileenmcnaughton/events{/privacy}","received_events_url":"https://api.github.com/users/eileenmcnaughton/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/eileenmcnaughton/civicrm-core","description":"CiviCRM (Core Application and Framework)","fork":true,"url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core","forks_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/forks","keys_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/teams","hooks_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/hooks","issue_events_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/issues/events{/number}","events_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/events","assignees_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/assignees{/user}","branches_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/branches{/branch}","tags_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/tags","blobs_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/git/refs{/sha}","trees_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/statuses/{sha}","languages_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/languages","stargazers_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/stargazers","contributors_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/contributors","subscribers_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/subscribers","subscription_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/subscription","commits_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/commits{/sha}","git_commits_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/git/commits{/sha}","comments_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/comments{/number}","issue_comment_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/issues/comments{/number}","contents_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/contents/{+path}","compare_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/merges","archive_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/downloads","issues_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/issues{/number}","pulls_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/pulls{/number}","milestones_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/milestones{/number}","notifications_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/labels{/name}","releases_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/releases{/id}","deployments_url":"https://api.github.com/repos/eileenmcnaughton/civicrm-core/deployments","created_at":"2013-03-04T23:49:52Z","updated_at":"2015-03-23T03:03:28Z","pushed_at":"2016-11-16T19:08:14Z","git_url":"git://github.com/eileenmcnaughton/civicrm-core.git","ssh_url":"git@github.com:eileenmcnaughton/civicrm-core.git","clone_url":"https://github.com/eileenmcnaughton/civicrm-core.git","svn_url":"https://github.com/eileenmcnaughton/civicrm-core","homepage":null,"size":174572,"stargazers_count":1,"watchers_count":1,"language":"PHP","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":0,"forks":1,"open_issues":0,"watchers":1,"default_branch":"code_ideas"}},"base":{"label":"civicrm:master","ref":"master","sha":"631364377cf7a9290b3f90ffe66b995a73e6d9ee","user":{"login":"civicrm","id":136373,"avatar_url":"https://avatars.githubusercontent.com/u/136373?v=3","gravatar_id":"","url":"https://api.github.com/users/civicrm","html_url":"https://github.com/civicrm","followers_url":"https://api.github.com/users/civicrm/followers","following_url":"https://api.github.com/users/civicrm/following{/other_user}","gists_url":"https://api.github.com/users/civicrm/gists{/gist_id}","starred_url":"https://api.github.com/users/civicrm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/civicrm/subscriptions","organizations_url":"https://api.github.com/users/civicrm/orgs","repos_url":"https://api.github.com/users/civicrm/repos","events_url":"https://api.github.com/users/civicrm/events{/privacy}","received_events_url":"https://api.github.com/users/civicrm/received_events","type":"Organization","site_admin":false},"repo":{"id":8495499,"name":"civicrm-core","full_name":"civicrm/civicrm-core","owner":{"login":"civicrm","id":136373,"avatar_url":"https://avatars.githubusercontent.com/u/136373?v=3","gravatar_id":"","url":"https://api.github.com/users/civicrm","html_url":"https://github.com/civicrm","followers_url":"https://api.github.com/users/civicrm/followers","following_url":"https://api.github.com/users/civicrm/following{/other_user}","gists_url":"https://api.github.com/users/civicrm/gists{/gist_id}","starred_url":"https://api.github.com/users/civicrm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/civicrm/subscriptions","organizations_url":"https://api.github.com/users/civicrm/orgs","repos_url":"https://api.github.com/users/civicrm/repos","events_url":"https://api.github.com/users/civicrm/events{/privacy}","received_events_url":"https://api.github.com/users/civicrm/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/civicrm/civicrm-core","description":"CiviCRM (Core Application and Framework)","fork":false,"url":"https://api.github.com/repos/civicrm/civicrm-core","forks_url":"https://api.github.com/repos/civicrm/civicrm-core/forks","keys_url":"https://api.github.com/repos/civicrm/civicrm-core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/civicrm/civicrm-core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/civicrm/civicrm-core/teams","hooks_url":"https://api.github.com/repos/civicrm/civicrm-core/hooks","issue_events_url":"https://api.github.com/repos/civicrm/civicrm-core/issues/events{/number}","events_url":"https://api.github.com/repos/civicrm/civicrm-core/events","assignees_url":"https://api.github.com/repos/civicrm/civicrm-core/assignees{/user}","branches_url":"https://api.github.com/repos/civicrm/civicrm-core/branches{/branch}","tags_url":"https://api.github.com/repos/civicrm/civicrm-core/tags","blobs_url":"https://api.github.com/repos/civicrm/civicrm-core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/civicrm/civicrm-core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/civicrm/civicrm-core/git/refs{/sha}","trees_url":"https://api.github.com/repos/civicrm/civicrm-core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/civicrm/civicrm-core/statuses/{sha}","languages_url":"https://api.github.com/repos/civicrm/civicrm-core/languages","stargazers_url":"https://api.github.com/repos/civicrm/civicrm-core/stargazers","contributors_url":"https://api.github.com/repos/civicrm/civicrm-core/contributors","subscribers_url":"https://api.github.com/repos/civicrm/civicrm-core/subscribers","subscription_url":"https://api.github.com/repos/civicrm/civicrm-core/subscription","commits_url":"https://api.github.com/repos/civicrm/civicrm-core/commits{/sha}","git_commits_url":"https://api.github.com/repos/civicrm/civicrm-core/git/commits{/sha}","comments_url":"https://api.github.com/repos/civicrm/civicrm-core/comments{/number}","issue_comment_url":"https://api.github.com/repos/civicrm/civicrm-core/issues/comments{/number}","contents_url":"https://api.github.com/repos/civicrm/civicrm-core/contents/{+path}","compare_url":"https://api.github.com/repos/civicrm/civicrm-core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/civicrm/civicrm-core/merges","archive_url":"https://api.github.com/repos/civicrm/civicrm-core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/civicrm/civicrm-core/downloads","issues_url":"https://api.github.com/repos/civicrm/civicrm-core/issues{/number}","pulls_url":"https://api.github.com/repos/civicrm/civicrm-core/pulls{/number}","milestones_url":"https://api.github.com/repos/civicrm/civicrm-core/milestones{/number}","notifications_url":"https://api.github.com/repos/civicrm/civicrm-core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/civicrm/civicrm-core/labels{/name}","releases_url":"https://api.github.com/repos/civicrm/civicrm-core/releases{/id}","deployments_url":"https://api.github.com/repos/civicrm/civicrm-core/deployments","created_at":"2013-03-01T06:11:56Z","updated_at":"2016-11-13T19:22:12Z","pushed_at":"2016-11-16T17:00:35Z","git_url":"git://github.com/civicrm/civicrm-core.git","ssh_url":"git@github.com:civicrm/civicrm-core.git","clone_url":"https://github.com/civicrm/civicrm-core.git","svn_url":"https://github.com/civicrm/civicrm-core","homepage":null,"size":172050,"stargazers_count":174,"watchers_count":174,"language":"PHP","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":501,"mirror_url":null,"open_issues_count":103,"forks":501,"open_issues":103,"watchers":174,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368"},"html":{"href":"https://github.com/civicrm/civicrm-core/pull/9368"},"issue":{"href":"https://api.github.com/repos/civicrm/civicrm-core/issues/9368"},"comments":{"href":"https://api.github.com/repos/civicrm/civicrm-core/issues/9368/comments"},"review_comments":{"href":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368/comments"},"review_comment":{"href":"https://api.github.com/repos/civicrm/civicrm-core/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/civicrm/civicrm-core/pulls/9368/commits"},"statuses":{"href":"https://api.github.com/repos/civicrm/civicrm-core/statuses/f2e79f66bc7eb4a3328a53e8b658ef772fb3e70b"}}}}
{"actor":{"display_login":"eileenmcnaughton"}}