? advanced-help-readme-310819-4.patch ? advanced-help-readme-310819-5.patch ? not-found-nosearch-312290-1.patch ? suppress-admin-menu-285020-1.patch ? suppress-admin-menu-285020-2.patch Index: advanced_help.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advanced_help/advanced_help.module,v retrieving revision 1.24 diff -u -p -r1.24 advanced_help.module --- advanced_help.module 15 Sep 2008 19:16:10 -0000 1.24 +++ advanced_help.module 23 Sep 2008 16:34:03 -0000 @@ -619,10 +619,18 @@ function _advanced_help_parse_ini() { $path = "$module_path/help"; $info = parse_ini_file("./$module_path/help/$module.help.ini", TRUE); } - else if (file_exists("$help_path/$module/$module.help.ini")) { + elseif (file_exists("$help_path/$module/$module.help.ini")) { $path = "$help_path/$module"; $info = parse_ini_file("./$help_path/$module/$module.help.ini", TRUE); } + else { + // Look for one or more README files. + $files = file_scan_directory("./$module_path", '^(README|readme).*\.(txt|TXT)$', array('.', '..', 'CVS'), 0, FALSE); + $path = "./$module_path"; + foreach ($files as $name => $fileinfo) { + $info[$fileinfo->basename] = array('line break' => TRUE, 'readme file' => TRUE, 'file' => $fileinfo->basename, 'title' => $fileinfo->name); + } + } if (!empty($info)) { // Get translated titles: global $language; @@ -645,7 +653,7 @@ function _advanced_help_parse_ini() { 'parent' => isset($topic['parent']) ? $topic['parent'] : 0, 'popup width' => isset($topic['popup width']) ? $topic['popup width'] : 500, 'popup height' => isset($topic['popup height']) ? $topic['popup height'] : 500, - 'file' => $file . '.html', // require extension + 'file' => isset($topic['readme file']) ? $file : $file . '.html', // require extension 'path' => $path, // not in .ini file 'line break' => isset($topic['line break']) ? $topic['line break'] : (isset($cache['settings'][$module]['line break']) ? $cache['settings'][$module]['line break'] : FALSE), 'navigation' => isset($topic['navigation']) ? $topic['navigation'] : (isset($cache['settings'][$module]['navigation']) ? $cache['settings'][$module]['navigation'] : TRUE),