// Merge -> revision 8342

This commit is contained in:
rMalie committed 2011-09-05 14:56:02 +00:00
1 parent d84373e4d3
commit 3d89058084
46 files changed
+1299 -249

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>treepodia</name>
<displayName><![CDATA[Treepodia]]></displayName>
<version><![CDATA[1.6]]></version>
<version><![CDATA[1.6.1]]></version>
<description><![CDATA[Cover your entire catalog with product videos in 24 hours.]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
+2 -2
View File
@@ -47,7 +47,7 @@ class Treepodia extends Module
{
$this->name = 'treepodia';
$this->tab = 'front_office_features';
$this->version = '1.6';
$this->version = '1.6.1';
$this->displayName = 'Treepodia';
parent::__construct();
@@ -86,7 +86,7 @@ class Treepodia extends Module
if (!($domain = Configuration::get('PS_SHOP_DOMAIN')))
$domain = $_SERVER['HTTP_HOST'];
$host = ((Configuration::get('PS_SSL_ENABLED') OR Tools::usingSecureMode()) ? 'https://'.$domain : 'http://'.$domain).__PS_BASE_URI__;
$host = ((Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://'.$domain : 'http://'.$domain).__PS_BASE_URI__;
return $host;
}