fixed #3866

zikula · Dec 3, 2017 · 04c7321 · 04c7321
1 parent 85fd227
commit 04c7321
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG-1.5.md b/CHANGELOG-1.5.md
@@ -10,6 +10,7 @@ CHANGELOG - ZIKULA 1.5.x
     - Disabled CSRF protection for search results (#3831).
     - Allowing audio files with the .mp3 and .wav extensions to be accessible via the modules and themes folders. (#3858).
     - Fixed logical issue in Users module's mass mailing helper (#3863).
+    - Fixed potential problems with invalid hook bundles (#3866).
 
  - Vendor updates:
     - composer/ca-bundle updated from 1.0.8 to 1.1.0

diff --git a/src/lib/Zikula/Bundle/HookBundle/Controller/HookController.php b/src/lib/Zikula/Bundle/HookBundle/Controller/HookController.php
@@ -162,6 +162,9 @@ public function editAction($moduleName)
                         $category = $nonPersistedSubscribers[$hooksubscriberArea]->getCategory();
                     } else {
                         // @deprecated
+                        if (null === $hooksubscriberVersionObj) {
+                            continue;
+                        }
                         $hooksubscriberAreasToTitles[$hooksubscriberArea] = $this->get('translator.default')->__(/** @Ignore */
                             $hooksubscriberVersionObj->getHookSubscriberBundle($hooksubscriberArea)->getTitle());
                         $category = $this->get('translator.default')->__(/** @Ignore */
@@ -270,6 +273,9 @@ public function editAction($moduleName)
                         $category = $nonPersistedProviders[$hookproviderArea]->getCategory();
                     } else {
                         // @deprecated
+                        if (null === $hookproviderVersionObj) {
+                            continue;
+                        }
                         $providerBundle = $hookproviderVersionObj->getHookProviderBundle($hookproviderArea);
                         $hookproviderAreasToTitles[$hookproviderArea] = $this->get('translator.default')->__(/** @Ignore */$providerBundle->getTitle());
                         $category = $this->get('translator.default')->__(/** @Ignore */$providerBundle->getCategory());

diff --git a/src/lib/Zikula/Bundle/HookBundle/Resources/views/Hook/provider.html.twig b/src/lib/Zikula/Bundle/HookBundle/Resources/views/Hook/provider.html.twig
@@ -51,7 +51,7 @@
                                 {% if total_bindings > 0 %}
                                     <div class="row">
                                         <div class="col-md-5">
-                                            {{ subscriber.areasToTitles[sarea] }} <span class="small">({{ sarea }})</span>
+                                            {{ subscriber.areasToTitles[sarea]|default('Area') }} <span class="small">({{ sarea }})</span>
                                         </div>
                                         <div class="col-md-1 text-right">
                                             <span class="fa fa-paperclip"></span>

diff --git a/src/lib/Zikula/Bundle/HookBundle/Resources/views/Hook/subscriber.html.twig b/src/lib/Zikula/Bundle/HookBundle/Resources/views/Hook/subscriber.html.twig
@@ -61,7 +61,7 @@
                                     <li id="availablearea_{{ available_area_identifier }}" class="z-draggable clearfix list-group-item">
                                         <i class="fa fa-long-arrow-left"></i>
                                         <span>
-                                            {{ hookprovider.areasToTitles[parea] }} <span class="small">({{ parea }})
+                                            {{ hookprovider.areasToTitles[parea]|default('Area') }} <span class="small">({{ parea }})
                                         </span>
                                         <a class="detachlink hide" title="{{ __('Detach') }} {{ hookprovider.areasToTitles[parea] }}" href="javascript:void(0)" onclick="unbindProviderAreaFromSubscriberArea('##id', '##name', '{{ parea_md5 }}', '{{ parea }}');"><i class="fa fa-remove"></i></a></span>
                                         <input type="hidden" id="availablearea_{{ available_area_identifier }}_a" value="{{ parea }}" />