Last active
December 11, 2015 04:38
-
-
Save yec/4546451 to your computer and use it in GitHub Desktop.
This commit fixes an issue with featured fields & install profile showing errors
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git b/fences.admin.inc a/fences.admin.inc | |
index e6f882a..ce29a96 100644 | |
--- b/fences.admin.inc | |
+++ a/fences.admin.inc | |
@@ -14,32 +14,34 @@ function _fences_theme($existing, $type, $theme, $path) { | |
$supported_hooks = array('field'); | |
foreach ($supported_hooks as $hook) { | |
- foreach ($fences[$hook] as $suggestion => $data) { | |
- // Manually register the suggestions for a module, but let hook_theme | |
- // auto-discover theme-owned suggestions as it normally does. | |
- if ($fences[$hook][$suggestion]['type'] == 'module') { | |
- $hook_suggestion = $hook . '__fences_' . str_replace('-', '_', $suggestion); | |
- $hook_suggestions = array($hook_suggestion); | |
- // Register the "-multiple" suggestion if that template was found. | |
- if ($fences[$hook][$suggestion]['multiple']) { | |
- $hook_suggestions[] = $hook_suggestion . '_multiple'; | |
- } | |
- foreach ($hook_suggestions as $name) { | |
- $hooks[$name] = array( | |
- 'base hook' => $hook, | |
- 'render element' => $existing[$hook]['render element'], | |
- 'type' => $fences[$hook][$suggestion]['type'], | |
- 'theme path' => $existing[$hook]['theme path'], | |
- 'template' => str_replace('_', '-', $name), | |
- 'path' => $fences[$hook][$suggestion]['path'], | |
- ); | |
+ if (!empty($existing[$hook])) { | |
+ foreach ($fences[$hook] as $suggestion => $data) { | |
+ // Manually register the suggestions for a module, but let hook_theme | |
+ // auto-discover theme-owned suggestions as it normally does. | |
+ if ($fences[$hook][$suggestion]['type'] == 'module') { | |
+ $hook_suggestion = $hook . '__fences_' . str_replace('-', '_', $suggestion); | |
+ $hook_suggestions = array($hook_suggestion); | |
+ // Register the "-multiple" suggestion if that template was found. | |
+ if ($fences[$hook][$suggestion]['multiple']) { | |
+ $hook_suggestions[] = $hook_suggestion . '_multiple'; | |
+ } | |
+ foreach ($hook_suggestions as $name) { | |
+ $hooks[$name] = array( | |
+ 'base hook' => $hook, | |
+ 'render element' => $existing[$hook]['render element'], | |
+ 'type' => $fences[$hook][$suggestion]['type'], | |
+ 'theme path' => $existing[$hook]['theme path'], | |
+ 'template' => str_replace('_', '-', $name), | |
+ 'path' => $fences[$hook][$suggestion]['path'], | |
+ ); | |
+ } | |
} | |
} | |
} | |
} | |
// Register theme hook suggestions for field_collection's entity. | |
- if (module_exists('entity')) { | |
+ if (module_exists('entity') && !empty($existing['entity'])) { | |
$hooks['entity__fences_no_wrapper'] = array( | |
'base hook' => 'entity', | |
'render element' => $existing['entity']['render element'], |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment