{"action":"created","comment":{"url":"https://api.github.com/repos/joomla/joomla-cms/pulls/comments/74077521","id":74077521,"diff_hunk":"@@ -609,96 +672,116 @@\n \t\t\t<option value=\"5\">J5</option>\n \t\t</field>\n \n-\t\t<field name=\"show_empty_categories_cat\"\n+\t\t<field\n+\t\t\tname=\"show_empty_categories_cat\"\n \t\t\ttype=\"radio\"\n-\t\t\tclass=\"btn-group btn-group-yesno\"\n-\t\t\tdefault=\"0\"\n \t\t\tlabel=\"JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL\"\n \t\t\tdescription=\"COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC\"\n+\t\t\tclass=\"btn-group btn-group-yesno\"\n+\t\t\tdefault=\"0\"\n \t\t\tshowon=\"maxLevelcat:-1,1,2,3,4,5\"\n-\t\t>\n+\t\t\t>\n \t\t\t<option value=\"1\">JSHOW</option>\n \t\t\t<option value=\"0\">JHIDE</option>\n \t\t</field>\n \n-\t\t<field name=\"show_subcat_desc_cat\"\n+\t\t<field\n+\t\t\tname=\"show_subcat_desc_cat\"\n \t\t\ttype=\"radio\"\n-\t\t\tclass=\"btn-group btn-group-yesno\"\n-\t\t\tdefault=\"1\"\n \t\t\tlabel=\"JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL\"\n \t\t\tdescription=\"JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC\"\n+\t\t\tclass=\"btn-group btn-group-yesno\"\n+\t\t\tdefault=\"1\"\n \t\t\tshowon=\"maxLevelcat:-1,1,2,3,4,5\"\n-\t\t>\n+\t\t\t>\n \t\t\t<option value=\"1\">JSHOW</option>\n \t\t\t<option value=\"0\">JHIDE</option>\n \t\t</field>\n \n-\t\t<field name=\"show_cat_num_articles_cat\"\n+\t\t<field\n+\t\t\tname=\"show_cat_num_articles_cat\"\n \t\t\ttype=\"radio\"\n-\t\t\tclass=\"btn-group btn-group-yesno\"\n-\t\t\tdefault=\"1\"\n \t\t\tlabel=\"COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL\"\n \t\t\tdescription=\"COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC\"\n-\t\t>\n+\t\t\tclass=\"btn-group btn-group-yesno\"\n+\t\t\tdefault=\"1\"\n+\t\t\t>\n \t\t\t<option value=\"1\">JSHOW</option>\n \t\t\t<option value=\"0\">JHIDE</option>\n \t\t</field>\n-\n \t</fieldset>\n \n-\t<fieldset name=\"blog_default_parameters\"\n+\t<fieldset\n+\t\tname=\"blog_default_parameters\"\n \t\tlabel=\"COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL\"\n \t\tdescription=\"COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC\"\n \t\t>\n-\n-\t\t<field name=\"num_leading_articles\"\n+\t\t<field\n+\t\t\tname=\"num_leading_articles\"\n \t\t\ttype=\"text\"\n-\t\t\tdefault=\"1\"\n \t\t\tlabel=\"JGLOBAL_NUM_LEADING_ARTICLES_LABEL\"\n-\t\t\tdescription=\"JGLOBAL_NUM_LEADING_ARTICLES_DESC\">\n-\t\t</field>\n+\t\t\tdescription=\"JGLOBAL_NUM_LEADING_ARTICLES_DESC\"\n+\t\t\tdefault=\"1\"\n+\t\t/>\n \n-\t\t<field name=\"num_intro_articles\"\n+\t\t<field\n+\t\t\tname=\"num_intro_articles\"\n \t\t\ttype=\"text\"\n-\t\t\tdefault=\"4\"\n \t\t\tlabel=\"JGLOBAL_NUM_INTRO_ARTICLES_LABEL\"\n-\t\t\tdescription=\"JGLOBAL_NUM_INTRO_ARTICLES_DESC\">\n-\t\t</field>\n+\t\t\tdescription=\"JGLOBAL_NUM_INTRO_ARTICLES_DESC\"\n+\t\t\tdefault=\"4\"\n+\t\t/>\n \n-\t\t<field name=\"num_columns\"\n+\t\t<field\n+\t\t\tname=\"num_columns\"\n \t\t\ttype=\"text\"\n-\t\t\tdefault=\"2\"\n \t\t\tlabel=\"JGLOBAL_NUM_COLUMNS_LABEL\"\n-\t\t\tdescription=\"JGLOBAL_NUM_COLUMNS_DESC\">\n-\t\t</field>\n+\t\t\tdescription=\"JGLOBAL_NUM_COLUMNS_DESC\"\n+\t\t\tdefault=\"2\"\n+\t\t\t/>\n \n-\t\t<field name=\"num_links\"\n+\t\t<field\n+\t\t\tname=\"num_links\"\n \t\t\ttype=\"text\"\n-\t\t\tdefault=\"4\"\n \t\t\tlabel=\"JGLOBAL_NUM_LINKS_LABEL\"\n-\t\t\tdescription=\"JGLOBAL_NUM_LINKS_DESC\">\n-\t\t</field>\n+\t\t\tdescription=\"JGLOBAL_NUM_LINKS_DESC\"\n+\t\t\tdefault=\"4\"\n+\t\t/>\n \n-\t\t<field name=\"multi_column_order\"\n+\t\t<field\n+\t\t\tname=\"multi_column_order\"\n \t\t\ttype=\"list\"\n-\t\t\tdefault=\"0\"\n \t\t\tlabel=\"JGLOBAL_MULTI_COLUMN_ORDER_LABEL\"\n-\t\t\tdescription=\"JGLOBAL_MULTI_COLUMN_ORDER_DESC\">\n-\t\t\t<option\n-\t\t\t\tvalue=\"0\">JGLOBAL_DOWN</option>\n-\t\t\t<option\n-\t\t\t\tvalue=\"1\">JGLOBAL_ACROSS</option>\n+\t\t\tdescription=\"JGLOBAL_MULTI_COLUMN_ORDER_DESC\"\n+\t\t\tdefault=\"0\"\n+\t\t\t>\n+\t\t\t<option value=\"0\">JGLOBAL_DOWN</option>\n+\t\t\t<option value=\"1\">JGLOBAL_ACROSS</option>\n \t\t</field>\n \n-\t\t<field name=\"spacer1\"\n+\t\t<field\n+\t\t\tname=\"spacer1\"\n \t\t\ttype=\"spacer\"\n \t\t\thr=\"true\"\n+<<<<<<< d289eadb1b93728dbccb48f4a235f8c53c2839fe","path":"administrator/components/com_content/config.xml","position":914,"original_position":914,"commit_id":"008773bf4fbebb7c8c2ca644ac90862a4a2e6923","original_commit_id":"008773bf4fbebb7c8c2ca644ac90862a4a2e6923","user":{"login":"JoomliC","id":2385058,"avatar_url":"https://avatars.githubusercontent.com/u/2385058?v=3","gravatar_id":"","url":"https://api.github.com/users/JoomliC","html_url":"https://github.com/JoomliC","followers_url":"https://api.github.com/users/JoomliC/followers","following_url":"https://api.github.com/users/JoomliC/following{/other_user}","gists_url":"https://api.github.com/users/JoomliC/gists{/gist_id}","starred_url":"https://api.github.com/users/JoomliC/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JoomliC/subscriptions","organizations_url":"https://api.github.com/users/JoomliC/orgs","repos_url":"https://api.github.com/users/JoomliC/repos","events_url":"https://api.github.com/users/JoomliC/events{/privacy}","received_events_url":"https://api.github.com/users/JoomliC/received_events","type":"User","site_admin":false},"body":"Maybe a bit of clean here ? ;)","created_at":"2016-08-09T15:08:40Z","updated_at":"2016-08-09T15:08:40Z","html_url":"https://github.com/joomla/joomla-cms/pull/10659#discussion_r74077521","pull_request_url":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659","_links":{"self":{"href":"https://api.github.com/repos/joomla/joomla-cms/pulls/comments/74077521"},"html":{"href":"https://github.com/joomla/joomla-cms/pull/10659#discussion_r74077521"},"pull_request":{"href":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659"}}},"pull_request":{"url":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659","id":71815173,"html_url":"https://github.com/joomla/joomla-cms/pull/10659","diff_url":"https://github.com/joomla/joomla-cms/pull/10659.diff","patch_url":"https://github.com/joomla/joomla-cms/pull/10659.patch","issue_url":"https://api.github.com/repos/joomla/joomla-cms/issues/10659","number":10659,"state":"open","locked":false,"title":"[com_content]php and xml code style","user":{"login":"wojsmol","id":4176111,"avatar_url":"https://avatars.githubusercontent.com/u/4176111?v=3","gravatar_id":"","url":"https://api.github.com/users/wojsmol","html_url":"https://github.com/wojsmol","followers_url":"https://api.github.com/users/wojsmol/followers","following_url":"https://api.github.com/users/wojsmol/following{/other_user}","gists_url":"https://api.github.com/users/wojsmol/gists{/gist_id}","starred_url":"https://api.github.com/users/wojsmol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wojsmol/subscriptions","organizations_url":"https://api.github.com/users/wojsmol/orgs","repos_url":"https://api.github.com/users/wojsmol/repos","events_url":"https://api.github.com/users/wojsmol/events{/privacy}","received_events_url":"https://api.github.com/users/wojsmol/received_events","type":"User","site_admin":false},"body":"### Summary of Changes\r\nCode style changes for com_content\r\n### Testing Instructions\r\ncode review\r\n\r\ncc @andrepereiradasilva @JoomliC ","created_at":"2016-05-29T00:41:15Z","updated_at":"2016-08-09T15:08:40Z","closed_at":null,"merged_at":null,"merge_commit_sha":"77aeb79a5af881c938d50035365846d8134479e8","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659/commits","review_comments_url":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659/comments","review_comment_url":"https://api.github.com/repos/joomla/joomla-cms/pulls/comments{/number}","comments_url":"https://api.github.com/repos/joomla/joomla-cms/issues/10659/comments","statuses_url":"https://api.github.com/repos/joomla/joomla-cms/statuses/008773bf4fbebb7c8c2ca644ac90862a4a2e6923","head":{"label":"wojsmol:com_content-cs","ref":"com_content-cs","sha":"008773bf4fbebb7c8c2ca644ac90862a4a2e6923","user":{"login":"wojsmol","id":4176111,"avatar_url":"https://avatars.githubusercontent.com/u/4176111?v=3","gravatar_id":"","url":"https://api.github.com/users/wojsmol","html_url":"https://github.com/wojsmol","followers_url":"https://api.github.com/users/wojsmol/followers","following_url":"https://api.github.com/users/wojsmol/following{/other_user}","gists_url":"https://api.github.com/users/wojsmol/gists{/gist_id}","starred_url":"https://api.github.com/users/wojsmol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wojsmol/subscriptions","organizations_url":"https://api.github.com/users/wojsmol/orgs","repos_url":"https://api.github.com/users/wojsmol/repos","events_url":"https://api.github.com/users/wojsmol/events{/privacy}","received_events_url":"https://api.github.com/users/wojsmol/received_events","type":"User","site_admin":false},"repo":{"id":42508370,"name":"joomla-cms","full_name":"wojsmol/joomla-cms","owner":{"login":"wojsmol","id":4176111,"avatar_url":"https://avatars.githubusercontent.com/u/4176111?v=3","gravatar_id":"","url":"https://api.github.com/users/wojsmol","html_url":"https://github.com/wojsmol","followers_url":"https://api.github.com/users/wojsmol/followers","following_url":"https://api.github.com/users/wojsmol/following{/other_user}","gists_url":"https://api.github.com/users/wojsmol/gists{/gist_id}","starred_url":"https://api.github.com/users/wojsmol/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wojsmol/subscriptions","organizations_url":"https://api.github.com/users/wojsmol/orgs","repos_url":"https://api.github.com/users/wojsmol/repos","events_url":"https://api.github.com/users/wojsmol/events{/privacy}","received_events_url":"https://api.github.com/users/wojsmol/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/wojsmol/joomla-cms","description":"Home of the Joomla! Content Management System","fork":true,"url":"https://api.github.com/repos/wojsmol/joomla-cms","forks_url":"https://api.github.com/repos/wojsmol/joomla-cms/forks","keys_url":"https://api.github.com/repos/wojsmol/joomla-cms/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wojsmol/joomla-cms/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wojsmol/joomla-cms/teams","hooks_url":"https://api.github.com/repos/wojsmol/joomla-cms/hooks","issue_events_url":"https://api.github.com/repos/wojsmol/joomla-cms/issues/events{/number}","events_url":"https://api.github.com/repos/wojsmol/joomla-cms/events","assignees_url":"https://api.github.com/repos/wojsmol/joomla-cms/assignees{/user}","branches_url":"https://api.github.com/repos/wojsmol/joomla-cms/branches{/branch}","tags_url":"https://api.github.com/repos/wojsmol/joomla-cms/tags","blobs_url":"https://api.github.com/repos/wojsmol/joomla-cms/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wojsmol/joomla-cms/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wojsmol/joomla-cms/git/refs{/sha}","trees_url":"https://api.github.com/repos/wojsmol/joomla-cms/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wojsmol/joomla-cms/statuses/{sha}","languages_url":"https://api.github.com/repos/wojsmol/joomla-cms/languages","stargazers_url":"https://api.github.com/repos/wojsmol/joomla-cms/stargazers","contributors_url":"https://api.github.com/repos/wojsmol/joomla-cms/contributors","subscribers_url":"https://api.github.com/repos/wojsmol/joomla-cms/subscribers","subscription_url":"https://api.github.com/repos/wojsmol/joomla-cms/subscription","commits_url":"https://api.github.com/repos/wojsmol/joomla-cms/commits{/sha}","git_commits_url":"https://api.github.com/repos/wojsmol/joomla-cms/git/commits{/sha}","comments_url":"https://api.github.com/repos/wojsmol/joomla-cms/comments{/number}","issue_comment_url":"https://api.github.com/repos/wojsmol/joomla-cms/issues/comments{/number}","contents_url":"https://api.github.com/repos/wojsmol/joomla-cms/contents/{+path}","compare_url":"https://api.github.com/repos/wojsmol/joomla-cms/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wojsmol/joomla-cms/merges","archive_url":"https://api.github.com/repos/wojsmol/joomla-cms/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wojsmol/joomla-cms/downloads","issues_url":"https://api.github.com/repos/wojsmol/joomla-cms/issues{/number}","pulls_url":"https://api.github.com/repos/wojsmol/joomla-cms/pulls{/number}","milestones_url":"https://api.github.com/repos/wojsmol/joomla-cms/milestones{/number}","notifications_url":"https://api.github.com/repos/wojsmol/joomla-cms/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wojsmol/joomla-cms/labels{/name}","releases_url":"https://api.github.com/repos/wojsmol/joomla-cms/releases{/id}","deployments_url":"https://api.github.com/repos/wojsmol/joomla-cms/deployments","created_at":"2015-09-15T09:29:35Z","updated_at":"2016-01-14T21:52:27Z","pushed_at":"2016-08-09T08:24:43Z","git_url":"git://github.com/wojsmol/joomla-cms.git","ssh_url":"git@github.com:wojsmol/joomla-cms.git","clone_url":"https://github.com/wojsmol/joomla-cms.git","svn_url":"https://github.com/wojsmol/joomla-cms","homepage":"http://joomla.org","size":153377,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"staging"}},"base":{"label":"joomla:staging","ref":"staging","sha":"88040a72d2352e67784cf24950475405d47a12e6","user":{"login":"joomla","id":751633,"avatar_url":"https://avatars.githubusercontent.com/u/751633?v=3","gravatar_id":"","url":"https://api.github.com/users/joomla","html_url":"https://github.com/joomla","followers_url":"https://api.github.com/users/joomla/followers","following_url":"https://api.github.com/users/joomla/following{/other_user}","gists_url":"https://api.github.com/users/joomla/gists{/gist_id}","starred_url":"https://api.github.com/users/joomla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joomla/subscriptions","organizations_url":"https://api.github.com/users/joomla/orgs","repos_url":"https://api.github.com/users/joomla/repos","events_url":"https://api.github.com/users/joomla/events{/privacy}","received_events_url":"https://api.github.com/users/joomla/received_events","type":"Organization","site_admin":false},"repo":{"id":2464908,"name":"joomla-cms","full_name":"joomla/joomla-cms","owner":{"login":"joomla","id":751633,"avatar_url":"https://avatars.githubusercontent.com/u/751633?v=3","gravatar_id":"","url":"https://api.github.com/users/joomla","html_url":"https://github.com/joomla","followers_url":"https://api.github.com/users/joomla/followers","following_url":"https://api.github.com/users/joomla/following{/other_user}","gists_url":"https://api.github.com/users/joomla/gists{/gist_id}","starred_url":"https://api.github.com/users/joomla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joomla/subscriptions","organizations_url":"https://api.github.com/users/joomla/orgs","repos_url":"https://api.github.com/users/joomla/repos","events_url":"https://api.github.com/users/joomla/events{/privacy}","received_events_url":"https://api.github.com/users/joomla/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/joomla/joomla-cms","description":"Home of the Joomla! Content Management System","fork":false,"url":"https://api.github.com/repos/joomla/joomla-cms","forks_url":"https://api.github.com/repos/joomla/joomla-cms/forks","keys_url":"https://api.github.com/repos/joomla/joomla-cms/keys{/key_id}","collaborators_url":"https://api.github.com/repos/joomla/joomla-cms/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/joomla/joomla-cms/teams","hooks_url":"https://api.github.com/repos/joomla/joomla-cms/hooks","issue_events_url":"https://api.github.com/repos/joomla/joomla-cms/issues/events{/number}","events_url":"https://api.github.com/repos/joomla/joomla-cms/events","assignees_url":"https://api.github.com/repos/joomla/joomla-cms/assignees{/user}","branches_url":"https://api.github.com/repos/joomla/joomla-cms/branches{/branch}","tags_url":"https://api.github.com/repos/joomla/joomla-cms/tags","blobs_url":"https://api.github.com/repos/joomla/joomla-cms/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/joomla/joomla-cms/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/joomla/joomla-cms/git/refs{/sha}","trees_url":"https://api.github.com/repos/joomla/joomla-cms/git/trees{/sha}","statuses_url":"https://api.github.com/repos/joomla/joomla-cms/statuses/{sha}","languages_url":"https://api.github.com/repos/joomla/joomla-cms/languages","stargazers_url":"https://api.github.com/repos/joomla/joomla-cms/stargazers","contributors_url":"https://api.github.com/repos/joomla/joomla-cms/contributors","subscribers_url":"https://api.github.com/repos/joomla/joomla-cms/subscribers","subscription_url":"https://api.github.com/repos/joomla/joomla-cms/subscription","commits_url":"https://api.github.com/repos/joomla/joomla-cms/commits{/sha}","git_commits_url":"https://api.github.com/repos/joomla/joomla-cms/git/commits{/sha}","comments_url":"https://api.github.com/repos/joomla/joomla-cms/comments{/number}","issue_comment_url":"https://api.github.com/repos/joomla/joomla-cms/issues/comments{/number}","contents_url":"https://api.github.com/repos/joomla/joomla-cms/contents/{+path}","compare_url":"https://api.github.com/repos/joomla/joomla-cms/compare/{base}...{head}","merges_url":"https://api.github.com/repos/joomla/joomla-cms/merges","archive_url":"https://api.github.com/repos/joomla/joomla-cms/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/joomla/joomla-cms/downloads","issues_url":"https://api.github.com/repos/joomla/joomla-cms/issues{/number}","pulls_url":"https://api.github.com/repos/joomla/joomla-cms/pulls{/number}","milestones_url":"https://api.github.com/repos/joomla/joomla-cms/milestones{/number}","notifications_url":"https://api.github.com/repos/joomla/joomla-cms/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/joomla/joomla-cms/labels{/name}","releases_url":"https://api.github.com/repos/joomla/joomla-cms/releases{/id}","deployments_url":"https://api.github.com/repos/joomla/joomla-cms/deployments","created_at":"2011-09-27T02:07:38Z","updated_at":"2016-08-09T08:13:50Z","pushed_at":"2016-08-09T12:49:37Z","git_url":"git://github.com/joomla/joomla-cms.git","ssh_url":"git@github.com:joomla/joomla-cms.git","clone_url":"https://github.com/joomla/joomla-cms.git","svn_url":"https://github.com/joomla/joomla-cms","homepage":"https://www.joomla.org","size":288204,"stargazers_count":2104,"watchers_count":2104,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2254,"mirror_url":null,"open_issues_count":514,"forks":2254,"open_issues":514,"watchers":2104,"default_branch":"staging"}},"_links":{"self":{"href":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659"},"html":{"href":"https://github.com/joomla/joomla-cms/pull/10659"},"issue":{"href":"https://api.github.com/repos/joomla/joomla-cms/issues/10659"},"comments":{"href":"https://api.github.com/repos/joomla/joomla-cms/issues/10659/comments"},"review_comments":{"href":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659/comments"},"review_comment":{"href":"https://api.github.com/repos/joomla/joomla-cms/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/joomla/joomla-cms/pulls/10659/commits"},"statuses":{"href":"https://api.github.com/repos/joomla/joomla-cms/statuses/008773bf4fbebb7c8c2ca644ac90862a4a2e6923"}}}}
{"actor":{"display_login":"JoomliC"}}