- Small bug fixes

thiagocamposviana · Jan 1, 2014 · 8f7b748 · 8f7b748
1 parent 269b0a8
commit 8f7b748
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Classes/Components/Blocks.php b/Classes/Components/Blocks.php
@@ -74,9 +74,13 @@ public function render()
             } else {
 
                 $sourceId = $block->valueObject->getFieldValue('source')->destinationContentId;
-                $sourceObj = $repository->getContentService()->loadContent($sourceId);
-                $parentId = $sourceObj->versionInfo->contentInfo->mainLocationId;
-                $blocks[$blockLocationId]['children'] = SearchHelper::fetchChildren($this->controller, $parentId, array(), $limit, $offset);
+                try {
+                    $sourceObj = $repository->getContentService()->loadContent($sourceId);
+                    $parentId = $sourceObj->versionInfo->contentInfo->mainLocationId;
+                    $blocks[$blockLocationId]['children'] = SearchHelper::fetchChildren($this->controller, $parentId, array(), $limit, $offset);
+                } catch (\Exception $e) {
+                    $blocks[$blockLocationId]['children'] = SearchHelper::fetchChildren($this->controller, $blockLocationId, array(), $limit, $offset);
+                }
 
             }
         }

diff --git a/Resources/views/content/image/content_line.html.twig b/Resources/views/content/image/content_line.html.twig
@@ -1,7 +1,6 @@
-{% if not ez_is_field_empty( content, 'image' ) %}
+{% if  content.fields.image is defined and not ez_is_field_empty( content, 'image' ) %}
 {% set image_alias = ez_image_alias( content.getField('image'), content.versionInfo,  alias|default('original') ) %}
 
 <img class="image-small" src="{{asset( image_alias.uri )}}" alt="{{ ez_content_name(content) }}" />
 
-{% endif %}
-
+{% endif %}