Merge pull request #36 from ZiZuu-store/dev

Merge dev branch

Author: drAlberT

README.md

@@ -1,14 +1,15 @@
 # [PrestaShop module "ZiZuu SEO ToolKit"](https://github.com/ZiZuu-store/zzSEOtk)
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/30806e55-0fe6-4323-ade1-fba266db8b4e/mini.png)](https://insight.sensiolabs.com/projects/30806e55-0fe6-4323-ade1-fba266db8b4e)
+
 [![Join the chat at https://gitter.im/ZiZuu-store/zzSEOtk](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ZiZuu-store/zzSEOtk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Handles a few basic SEO related improvements such as:
 * "hreflang"
 * "canonical"
 * "noindex"
 
-Being reported to work on **PS >= 1.6.0.9** .. but it should work on PS 1.6.x.x too
+Being reported to work on **PS >= 1.6.0.9** .. but it should work on PS 1.6.x.x too and *could work* on PS >= 1.5.0.1
 
 For production use the **latest stable [release](https://github.com/ZiZuu-store/zzSEOtk/releases/)**
 

zzseotk.php

@@ -17,7 +17,7 @@
     return;
 }
 
-class zzSeoTK extends Module
+class zzseotk extends Module
 {
     private $_controller;
 
@@ -74,7 +74,7 @@ public function __construct()
         $this->tab = 'seo';
         $this->version = '1.1.5';
         $this->need_instance = 0;
-        $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
+        $this->ps_versions_compliancy = array('min' => '1.5.0.1', 'max' => _PS_VERSION_);
         $this->bootstrap = true;
 
         parent::__construct();
@@ -321,12 +321,15 @@ private function _getCanonicalLink($id_lang = null, $id_shop = null, $add_qs = t
                 $canonical = $link->getCategoryLink($id, null, $id_lang, Tools::getValue('selected_filters', null), $id_shop);
                 break;
             case 'cms':
-                // getCMSLink($cms, $alias = null, $ssl = null, $id_lang = null, $id_shop = null, $relative_protocol = false)
-                $canonical = $link->getCmsLink($id, null, null, $id_lang, $id_shop);
+                if ($cat_id = (int)Tools::getValue('id_cms_category')) {
+                    // getCMSCategoryLink($cms_category, $alias = null, $id_lang = null, $id_shop = null, $relative_protocol = false)
+                    $canonical = $link->getCMSCategoryLink($cat_id, null, $id_lang, $id_shop);
+                } else {
+                    // getCMSLink($cms, $alias = null, $ssl = null, $id_lang = null, $id_shop = null, $relative_protocol = false)
+                    $canonical = $link->getCmsLink($id, null, null, $id_lang, $id_shop);
+                }
                 break;
 
-            case 'cms-category':
-                // getCMSCategoryLink ($cms_category, $alias = null, $id_lang = null, $id_shop = null, $relative_protocol = false)
             case 'supplier':
                 // getSupplierLink    ($supplier,     $alias = null, $id_lang = null, $id_shop = null, $relative_protocol = false)
             case 'manufacturer':