Skip to content

Instantly share code, notes, and snippets.

diff --git a/install/app/Installer/AddonsSetup.php b/install/app/Installer/AddonsSetup.php
index 2dd75598b7..6b2302d7fc 100644
--- a/install/app/Installer/AddonsSetup.php
+++ b/install/app/Installer/AddonsSetup.php
@@ -38,7 +38,9 @@ class AddonsSetup
Registry::clearCachedKeyValues(); // reset cache before installing an add-on
- if (fn_install_addon($addon_name, false, $install_demo, true) ) {
+ $install_demo_tmp = $install_demo || $addon_name === 'vendor_plans';
diff --git a/app/Tygh/Notifications/EventDispatcher.php b/app/Tygh/Notifications/EventDispatcher.php
index 0a5c22b240..9c32a17ba7 100644
--- a/app/Tygh/Notifications/EventDispatcher.php
+++ b/app/Tygh/Notifications/EventDispatcher.php
@@ -105,6 +105,7 @@ class EventDispatcher
);
}
+ $transport_message_schema = clone $transport_message_schema;
$transport_message_schema->init($data);
diff --git a/js/core/src/core/Tygh/plugins/object_selector/index.js b/js/core/src/core/Tygh/plugins/object_selector/index.js
index 95811f55c0..75909b6c5a 100644
--- a/js/core/src/core/Tygh/plugins/object_selector/index.js
+++ b/js/core/src/core/Tygh/plugins/object_selector/index.js
@@ -199,11 +199,25 @@ $.extend(ObjectSelector.prototype, {
return object.context;
};
- if (this.settings.data) {
+ var elm = this.$el;
From 9512fc5a48b92354fcb288e338074a471839a57a Mon Sep 17 00:00:00 2001
From: Talgat Hairullov <thairullov@cs-cart.com>
Date: Thu, 21 Nov 2019 14:23:45 +0400
Subject: [PATCH] [!] {@25168} Add-ons: SEO: Cache was not used for gets seo
name. Fixed.
---
app/functions/fn.ultimate.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/js/core/src/core/Tygh/plugins/object_picker/index.js b/js/core/src/core/Tygh/plugins/object_picker/index.js
index 61592784cb..7f165ce667 100644
--- a/js/core/src/core/Tygh/plugins/object_picker/index.js
+++ b/js/core/src/core/Tygh/plugins/object_picker/index.js
@@ -48,12 +48,12 @@ function init($elems, options) {
elemsMap[picker.options.objectType].push($elem);
}
+ });
diff --git a/app/Tygh/Notifications/EventDispatcher.php b/app/Tygh/Notifications/EventDispatcher.php
index f0e9bcfbdc..8097942c9d 100644
--- a/app/Tygh/Notifications/EventDispatcher.php
+++ b/app/Tygh/Notifications/EventDispatcher.php
@@ -62,22 +62,22 @@ class EventDispatcher
}
/**
- * @param string $event_id
- * @param mixed ...$data
<?php
/***************************************************************************
* *
* (c) 2004 Vladimir V. Kalynyak, Alexey V. Vinokurov, Ilya M. Shalnev *
* *
* This is commercial software, only users who have purchased a valid *
* license and accept to the terms of the License Agreement can install *
* and use this program. *
* *
****************************************************************************
<?php
use \Tygh\Registry;
define('AREA', 'A');
define('ACCOUNT_TYPE', 'admin');
require(dirname(__FILE__) . '/init.php');
Registry::set('runtime.company_id', 0);
<?php
use \Tygh\Registry;
define('AREA', 'A');
define('ACCOUNT_TYPE', 'admin');
require(dirname(__FILE__) . '/init.php');
Registry::set('runtime.company_id', 0);
diff --git a/app/addons/product_variations/controllers/backend/product_variations_converter.php b/app/addons/product_variations/controllers/backend/product_variations_converter.php
index d5c549ca39..32f3a153d7 100644
--- a/app/addons/product_variations/controllers/backend/product_variations_converter.php
+++ b/app/addons/product_variations/controllers/backend/product_variations_converter.php
@@ -1205,7 +1205,7 @@ function fn_product_variations_convert_get_child_products($limit = 1000)
. ' LEFT JOIN ?:categories AS ac ON ac.category_id = pca.category_id ?p'
. ' LEFT JOIN ?:category_descriptions AS mcd ON mcd.category_id = mc.category_id AND mcd.lang_code = ?s'
. ' LEFT JOIN ?:category_descriptions AS acd ON acd.category_id = ac.category_id AND acd.lang_code = ?s'
- . ' WHERE p.product_type = ?s AND p.__variation_options IS NOT NULL AND p.parent_product_id > 0 LIMIT ?i OFFSET ?i',
+ . ' WHERE p.product_type = ?s AND p.__variation_options IS NOT NULL A