Merge branch 'develop' of github.com:algolia/algoliasearch-magento into develop

Author: maxiloc

code/Helper/Config.php

@@ -28,6 +28,7 @@ class Algolia_Algoliasearch_Helper_Config extends Mage_Core_Helper_Abstract
     const EXCLUDED_PAGES                       = 'algoliasearch/autocomplete/excluded_pages';
     const MIN_POPULARITY                       = 'algoliasearch/autocomplete/min_popularity';
     const MIN_NUMBER_OF_RESULTS                = 'algoliasearch/autocomplete/min_number_of_results';
+    const RENDER_TEMPLATE_DIRECTIVES           = 'algoliasearch/autocomplete/render_template_directives';
 
     const NUMBER_OF_PRODUCT_RESULTS            = 'algoliasearch/products/number_product_results';
     const PRODUCT_ATTRIBUTES                   = 'algoliasearch/products/product_additional_attributes';
@@ -271,6 +272,11 @@ public function getExcludedPages($storeId = NULL)
         return array();
     }
 
+    public function getRenderTemplateDirectives($storeId = NULL)
+    {
+        return Mage::getStoreConfigFlag(self::RENDER_TEMPLATE_DIRECTIVES, $storeId);
+    }
+
     public function getSortingIndices($storeId = NULL)
     {
         $product_helper = Mage::helper('algoliasearch/entity_producthelper');

code/Helper/Entity/Pagehelper.php

@@ -45,14 +45,19 @@ public function getPages($storeId)
             if (! $page->getId())
                 continue;
 
-            $page_obj['objectID'] = $page->getId();
+            $content = $page->getContent();
+            if ($this->config->getRenderTemplateDirectives()) {
+                $tmplProc = Mage::helper('cms')->getPageTemplateProcessor();
+                $content = $tmplProc->filter($content);
+            }
 
+            $page_obj['objectID'] = $page->getId();
             $page_obj['url'] = Mage::helper('cms/page')->getPageUrl($page->getId());
-            $page_obj['content'] = $this->strip($page->getContent());
+            $page_obj['content'] = $this->strip($content);
 
             $pages[] = $page_obj;
         }
 
         return $pages;
     }
-}
+}

code/etc/config.xml

@@ -168,6 +168,7 @@
                 <sections>a:1:{s:18:"_1450089283397_397";a:3:{s:4:"name";s:5:"pages";s:5:"label";s:5:"Pages";s:11:"hitsPerPage";s:1:"2";}}</sections>
                 <min_popularity>1000</min_popularity>
                 <min_number_of_results>2</min_number_of_results>
+                <render_template_directives>1</render_template_directives>
             </autocomplete>
             <categories>
                 <number_category_suggestions>5</number_category_suggestions>
@@ -201,4 +202,4 @@
             </product_map>
         </algoliasearch>
     </default>
-</config> 
+</config>

code/etc/system.xml

@@ -32,7 +32,7 @@
                     <sort_order>10</sort_order>
                     <show_in_default>1</show_in_default>
                     <show_in_website>1</show_in_website>
-                    <show_in_store>1</show_in_store>  
+                    <show_in_store>1</show_in_store>
                     <expanded>1</expanded>
                     <comment>
                      <![CDATA[
@@ -146,7 +146,7 @@
                             <show_in_store>1</show_in_store>
                             <comment>
                                 <![CDATA[
-                                If set to Yes, the seach box will display a search-as-you-type drop-down menu. It requires your theme to expose a <code>top.search</code> and <code>content</code> block.
+                                If set to Yes, the search box will display a search-as-you-type drop-down menu. It requires your theme to expose a <code>top.search</code> and <code>content</code> block.
                                 ]]>
                             </comment>
                         </is_popup_enabled>
@@ -258,11 +258,25 @@
                             <show_in_store>1</show_in_store>
                             <comment>
                                 <![CDATA[
-                                Configure here the pages you don't want to search in.<br><br>
-                                <span style="font-size: 20px; color: #D83900">&#9888;</span> Do not forget to trigger the Algolia Search indexers whenever you modify those settings.
+                                Configure here the pages you don't want to search in.
                                 ]]>
                             </comment>
                         </excluded_pages>
+                        <render_template_directives translate="label comment">
+                            <label>Render template directives</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>30</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment>
+                                <![CDATA[
+                                For CMS pages, template directives (e.g. <code>{{block type="core/template" ...}}</code>) will be processed by default. Set this to "No" if you don't want to have template content indexed.<br><br>
+                                <span style="font-size: 20px; color: #D83900">&#9888;</span> Do not forget to trigger the Algolia Search indexers whenever you modify those settings.
+                                ]]>
+                            </comment>
+                        </render_template_directives>
                     </fields>
                 </autocomplete>
                 <instant>
@@ -531,7 +545,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <comment><![CDATA[You can specify the size of the images used at the Search Results Page.<br />
-                                If your images are already present in some size, eg. 265x265, Algolia's index job may not have to resize those, potentially saving time and resources.]]></comment>
+                                If your images are already present in some size, e.g. 265x265, Algolia's index job may not have to resize those, potentially saving time and resources.]]></comment>
                         </height>
                         <type translate="label comment">
                             <label>Type</label>
@@ -564,7 +578,7 @@
                             <show_in_store>1</show_in_store>
                             <comment>
                                 <![CDATA[
-                                If enabled, all inxdexing operations (add, remove & update operations) will be done asynchronously using the CRON mechanism.<br />
+                                If enabled, all indexing operations (add, remove & update operations) will be done asynchronously using the CRON mechanism.<br />
                                 <br>
                                 To schedule the run you need to add this in your crontab:<br>
                                 */5 * * * * php -f /absolute/path/to/magento/shell/indexer.php -- -reindex algolia_queue_runner