? issue-992376.patch
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.625
diff -u -p -r1.625 theme.inc
--- includes/theme.inc	29 Nov 2010 04:53:32 -0000	1.625
+++ includes/theme.inc	8 Dec 2010 10:59:54 -0000
@@ -2360,7 +2360,8 @@ function theme_get_suggestions($args, $b
   $prefix = $base;
   foreach ($args as $arg) {
     // Remove slashes or null per SA-CORE-2009-003.
-    $arg = str_replace(array("/", "\\", "\0"), '', $arg);
+    // Change - to _ as all underscores in theme registry hooks are converted to hyphens
+    $arg = str_replace(array("/", "\\", "\0", '-'), array('', '', '', '_'), $arg);
     // The percent acts as a wildcard for numeric arguments since
     // asterisks are not valid filename characters on many filesystems.
     if (is_numeric($arg)) {