Merge branch 'dev' into toggle-context-help

This commit is contained in:
Andrew Manning
2016-04-20 21:05:01 -04:00
326 changed files with 27310 additions and 26364 deletions

View File

@@ -150,7 +150,7 @@ EOT;
$help_url = z_root() . '/help?f=&cmd=' . App::$cmd;
if(! get_config('system','hide_help')) {
require_once('mod/help.php');
require_once('include/help.php');
$context_help = load_context_help();
$enable_context_help = get_config('system','enable_context_help') || 0;
$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'),'help_nav_btn',$context_help,$enable_context_help);