From 13271cb35d1b9789e319ec5c32bc78d1bc2380cd Mon Sep 17 00:00:00 2001 From: satish <satish.dvnk@vtiger.com> Date: Mon, 5 Jun 2017 14:02:45 +0530 Subject: [PATCH] Fixes #551 - vt7: Extension banner show also 6.x extension --- .../vtiger/marketplace/ExtensionStore.zip | Bin 41019 -> 41048 bytes .../settings/connectors/ExtnStore.php | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip index 044895b781a3b160a2183603d366f82e459aad12..c59e2608f3de5a5cf73762ab8f99752adcb2bd61 100644 GIT binary patch delta 3491 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 R8Ua+33ZN?ns+9l$0034_zMlX9 delta 3476 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 C)y7@` diff --git a/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php b/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php index a3e5ce16d..aab4dac20 100644 --- a/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php +++ b/pkg/vtiger/modules/ExtensionStore/settings/connectors/ExtnStore.php @@ -176,7 +176,12 @@ class Settings_ExtensionStore_ExtnStore_Connector { * @return type json reponse */ public function getListings($id = null, $type = 'Extension') { - $q = $id ? array('id' => $id, 'type' => $type) : array('type' => $type); + global $vtiger_current_version; + $q = array('type' => $type, 'vv'=> $vtiger_current_version); + if ($id) { + $q['id'] = $id; + } + try { $response = $this->api('/app/listings', 'GET', $q ? array('q' => Zend_Json::encode($q)) : null, false); return array('success' => true, 'response' => $response); -- GitLab