Merge branch 'staging' of github.com:joomla/joomla-cms into com_contact

joomla · Sep 14, 2017 · c34ba15 · c34ba15
2 parents 0d1242b + 3839cd6
commit c34ba15
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 62 deletions.
diff --git a/installation/application/web.php b/installation/application/web.php
@@ -405,7 +405,7 @@ protected function initialiseApp($options = array())
 		// Check for custom helpurl.
 		if (empty($forced['helpurl']))
 		{
-			$options['helpurl'] = 'https://help.joomla.org/proxy/index.php?keyref=Help{major}{minor}:{keyref}';
+			$options['helpurl'] = 'https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
 		}
 		else
 		{