From 50b3bbbc841fbcb02ec7c5c75e90a6741a28061a Mon Sep 17 00:00:00 2001 From: rMalie Date: Tue, 29 May 2012 12:05:13 +0000 Subject: [PATCH] // Fix Shop::isFeatureActive() #PSCFV-2609 --- classes/shop/Shop.php | 2 +- install-dev/data/img/t/AdminShop.gif | Bin 0 -> 1010 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 install-dev/data/img/t/AdminShop.gif diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index faf1e0afb..4d97ad846 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -790,7 +790,7 @@ class ShopCore extends ObjectModel static $feature_active = null; if ($feature_active === null) - $feature_active = Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE') && (count(Db::getInstance()->getValue('SELECT COUNT(*) FROM '._DB_PREFIX_.'shop')) > 1); + $feature_active = Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE') && (Db::getInstance()->getValue('SELECT COUNT(*) FROM '._DB_PREFIX_.'shop') > 1); return $feature_active; } diff --git a/install-dev/data/img/t/AdminShop.gif b/install-dev/data/img/t/AdminShop.gif new file mode 100644 index 0000000000000000000000000000000000000000..8db4081864b240c3280ec1ec2ae522422a706e15 GIT binary patch literal 1010 zcmXYwPly*p6vw~9QhHlF$Ogg^(P5hv#P>5+f(RDWa!bSJAavQ){rZQJNQe-ES%d!H z^xzY5m1xB|ZFumMAk{&AVuyw@uuLxsd5c|?;M=SJfOfhshh85+?XEzs28 zh72O)P(b|vgBfUWL-d*@STakr@tjPqEnP_rTn7WQWwh<(ph%So>OvXeeX9^}UgV~tL?99O|7O)r#S)3(U z#0pkpC9AUrtJuJ1Y-Dq`U=sz(C{j)Z)e&^!=AgqJ(TRA1C-X#4?kPOUGd!DTdUns@ zSzh49ywHn#2`};rujZ9r-D`N2H+VB|^yc2en_O_2i!OJCtJCjhTYv!%L^mT6B3UFx z@<jqM75}l>QN)Aq9K|^V>FKz(G)_+LJWB*LRtwz zccUZex_YrkAwkKMsN_naBxNX@GL>C9l%)a{Q=y8hgo;$5YN}Lq)liih)J%YG?zvwr*Hoy+?UZ=8PZ~odG7A1$vuPF zeV@O1dp}2?nRxrbhOaM;J$-uc_{8tOo`2`5Zx6h_dF;8RSB_u)?!}=m=05r0*2u+~ z`ww@V{&4=}?14Y;@7lWas~bP;UwiNDr|Y)wnVnd=z4*e$-6QKKcxU*?-jOQ>FZ~Ni CJm0_o literal 0 HcmV?d00001