Fix third-party component help in com_config (#13286)

chrisdavenport · web-flow · commit da60251ecfd5 · 2020-04-04T18:53:29.000+01:00
diff --git a/administrator/components/com_config/view/component/html.php b/administrator/components/com_config/view/component/html.php
@@ -98,6 +98,11 @@ protected function addToolbar()
 		JToolbarHelper::divider();
 		JToolbarHelper::cancel('config.cancel.component');
 		JToolbarHelper::divider();
-		JToolbarHelper::help('JHELP_COMPONENTS_' . $this->currentComponent . '_OPTIONS');
+
+		$helpUrl = $this->form->getData()->get('helpURL');
+		$helpKey = (string) $this->form->getXml()->config->help['key'];
+		$helpKey = $helpKey ?: 'JHELP_COMPONENTS_' . strtoupper($this->currentComponent) . '_OPTIONS';
+
+		JToolbarHelper::help($helpKey, (boolean) $helpUrl, null, $this->currentComponent);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,11 @@ protected function addToolbar()`
`98`	`98`	`JToolbarHelper::divider();`
`99`	`99`	`JToolbarHelper::cancel('config.cancel.component');`
`100`	`100`	`JToolbarHelper::divider();`
`101`		`- JToolbarHelper::help('JHELP_COMPONENTS_' . $this->currentComponent . '_OPTIONS');`
	`101`	`+`
	`102`	`+ $helpUrl = $this->form->getData()->get('helpURL');`
	`103`	`+ $helpKey = (string) $this->form->getXml()->config->help['key'];`
	`104`	`+ $helpKey = $helpKey ?: 'JHELP_COMPONENTS_' . strtoupper($this->currentComponent) . '_OPTIONS';`
	`105`	`+`
	`106`	`+ JToolbarHelper::help($helpKey, (boolean) $helpUrl, null, $this->currentComponent);`
`102`	`107`	`}`
`103`	`108`	`}`