Merge branch 'develop'

melisplatform · Jun 18, 2019 · bf6da20 · bf6da20
2 parents 36dfb70 + 1636aa5
commit bf6da20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Controller/Plugin/MelisFrontSearchResultsPlugin.php b/src/Controller/Plugin/MelisFrontSearchResultsPlugin.php
@@ -88,6 +88,9 @@ public function front()
 
         $moduleDirectory = '';
         $searchModulePath = self::SEARCH_PATH_MELIS_SITES;
+
+        $newModuleName = $moduleName;
+
         if (!is_null($moduleName)) {
             /**
              * Folder names inside vendor/melisplatform is in lowercase-delimited-by-hyphens
@@ -100,10 +103,12 @@ public function front()
             if (is_dir($_SERVER['DOCUMENT_ROOT'] . self::MELIS_SITES . $moduleName)) {
                 /** Module is located inside MelisSites folder. Ex. $moduleName = "MelisDemoCms" */
                 $moduleDirectory = $_SERVER['DOCUMENT_ROOT'] . self::MELIS_SITES . $moduleName;
+                $newModuleName = $moduleName;
             } elseif (is_dir($_SERVER['DOCUMENT_ROOT'] . self::VENDOR . $vendorSiteName)) {
                 /** Module is located inside Vendor folder. Ex. $moduleName = "melis-demo-cms" */
                 $moduleDirectory = $_SERVER['DOCUMENT_ROOT'] . self::VENDOR . $vendorSiteName;
                 $searchModulePath = self::SEARCH_PATH_VENDOR;
+                $newModuleName = $vendorSiteName;
             } else {
                 $siteDirExist = false;
             }
@@ -137,7 +142,7 @@ public function front()
                         // Get the current server protocol
                         $protocol = stripos($_SERVER['SERVER_PROTOCOL'], 'https') === true ? 'https://' : 'http://';
 
-                        $indexUrl = $protocol . $_SERVER['SERVER_NAME'] . '/melissearchindex/module/' . $moduleName . '/pageid/' . $mainPageId . '/exclude-pageid/0';
+                        $indexUrl = $protocol . $_SERVER['SERVER_NAME'] . '/melissearchindex/module/' . $newModuleName . '/pageid/' . $mainPageId . '/exclude-pageid/0';
                     } else {
                         $moduleDirWritable = false;
                     }
@@ -149,7 +154,7 @@ public function front()
         if ($isIndex && $keyword) {
             /** @var \MelisEngine\Service\MelisSearchService $searchSvc */
             $searchSvc = $this->getServiceLocator()->get('MelisSearch');
-            $searchresults = $searchSvc->search($keyword, $moduleName, true, $searchModulePath);
+            $searchresults = $searchSvc->search($keyword, $newModuleName, true, $searchModulePath);
             if (!empty($searchresults)) {
                 $searchresults = str_replace('&', '&amp;', $searchresults);
 

diff --git a/src/Listener/MelisFrontSEODispatchRouterRegularUrlListener.php b/src/Listener/MelisFrontSEODispatchRouterRegularUrlListener.php
@@ -196,7 +196,9 @@ function(MvcEvent $e){
                            $this->createTranslations($e, $datasPage->getMelisTemplate()->tpl_zf2_website_folder,
                                                      $datasPage->getMelisPageTree()->lang_cms_locale);
                             // create translations for loaded modules
-                           $this->createTranslationsOfLoadedModules($e,$datasTemplate->tpl_site_id,$pageTree->lang_cms_locale);
+                           if ($routingResult['renderMode'] == 'front') {
+                               $this->createTranslationsOfLoadedModules($e,$datasTemplate->tpl_site_id,$pageTree->lang_cms_locale);
+                           }
                            $this->initSession($datasPage->getMelisTemplate()->tpl_zf2_website_folder);
                        }