caaheek

diff --git a/app/Tygh/Web/Session.php b/app/Tygh/Web/Session.php
index 398e4d1..a89597a 100644
--- a/app/Tygh/Web/Session.php
+++ b/app/Tygh/Web/Session.php
@@ -472,6 +472,14 @@ class Session implements \ArrayAccess, \IteratorAggregate, \Countable
 
         session_start();
 
+        $cookie_params = session_get_cookie_params();
+

caaheek

diff --git a/app/addons/hybrid_auth/lib/Hybrid/thirdparty/Facebook/base_facebook.php b/app/addons/hybrid_auth/lib/Hybrid/thirdparty/Facebook/base_facebook.php
index b0d9ef9..81af2dc 100644
--- a/app/addons/hybrid_auth/lib/Hybrid/thirdparty/Facebook/base_facebook.php
+++ b/app/addons/hybrid_auth/lib/Hybrid/thirdparty/Facebook/base_facebook.php
@@ -837,13 +837,11 @@ abstract class BaseFacebook
       return false;
     }
 
-    $response_params = array();
-    parse_str($access_token_response, $response_params);

caaheek

diff --git a/design/backend/mail/templates/orders/low_stock.tpl b/design/backend/mail/templates/orders/low_stock.tpl
index 91d83ee..d85ec30 100644
--- a/design/backend/mail/templates/orders/low_stock.tpl
+++ b/design/backend/mail/templates/orders/low_stock.tpl
@@ -14,7 +14,7 @@
 </tr>
 <tr>
     <td>{__("amount")}:</td>
-    <td><b>{$new_amount|default:'0'}</b></td>
+    <td><b>{$new_qty}</b></td>

caaheek

diff --git a/app/Tygh/BlockManager/RenderManager.php b/app/Tygh/BlockManager/RenderManager.php
index be01119..f9cf5ae 100644
--- a/app/Tygh/BlockManager/RenderManager.php
+++ b/app/Tygh/BlockManager/RenderManager.php
@@ -782,9 +782,9 @@ class RenderManager
         $cache_key = implode('_', array(
             $block_data['block_id'],
             $block_data['snapping_id'],
-            (empty($block_data['grid_id']) ? 0 : $block_data['grid_id']),
-            (empty($block['object_id'])    ? 0 : $block['object_id']),

caaheek

diff --git a/js/tygh/ajax.js b/js/tygh/ajax.js
index 8f82a93..d8f92ce 100644
--- a/js/tygh/ajax.js
+++ b/js/tygh/ajax.js
@@ -452,7 +452,14 @@
                     matches = data.html[k].match(regex_all);
                     content = matches ? data.html[k].replace(regex_all, '') : data.html[k];
 
-                    $.ceDialog('destroy_loaded', {content: content});
+                    // Clean up any editors initialized inside of the target DOM element

caaheek

diff --git a/app/functions/fn.common.php b/app/functions/fn.common.php
index b8bce20..8eb15e0 100644
--- a/app/functions/fn.common.php
+++ b/app/functions/fn.common.php
@@ -903,6 +903,14 @@ function fn_add_breadcrumb($lang_value, $link = '', $nofollow = false)
         'nofollow' => $nofollow,
     );
 
+    if (empty($link)) { // Track the last element in the breadcrumbs.
+

caaheek

diff --git a/app/addons/vendor_plans/func.php b/app/addons/vendor_plans/func.php
index 0e30187..194fbf1 100644
--- a/app/addons/vendor_plans/func.php
+++ b/app/addons/vendor_plans/func.php
@@ -308,12 +308,18 @@ function fn_vendor_plans_dispatch_before_display()
 function fn_vendor_plans_update_product_pre(&$product_data, &$product_id, &$lang_code, &$can_update)
 {
     if ($can_update) {
+
         $company_id = Registry::get('runtime.company_id');

caaheek

diff --git a/app/Tygh/Tools/Archivers/PharArchiveCreator.php b/app/Tygh/Tools/Archivers/PharArchiveCreator.php
index 710f190..7d0f105 100644
--- a/app/Tygh/Tools/Archivers/PharArchiveCreator.php
+++ b/app/Tygh/Tools/Archivers/PharArchiveCreator.php
@@ -27,6 +27,9 @@ class PharArchiveCreator implements IArchiveCreator
     /** @var \PharData */
     protected $phar;
 
+    /** @var string */
+    protected $extension;

caaheek

diff --git a/app/Tygh/Mailer/AMessageBuilder.php b/app/Tygh/Mailer/AMessageBuilder.php
index 2f403af..905abad 100644
--- a/app/Tygh/Mailer/AMessageBuilder.php
+++ b/app/Tygh/Mailer/AMessageBuilder.php
@@ -272,7 +272,7 @@ abstract class AMessageBuilder implements IMessageBuilder
             }
 
             if (!empty($from['name'])) {
-                $name = $from['name'];
+                $name = !empty($company[$from['name']]) ? $company[$from['name']] : $from['name'];

caaheek

diff --git a/app/Tygh/Mailer/AMessageBuilder.php b/app/Tygh/Mailer/AMessageBuilder.php
index 2f403af..905abad 100644
--- a/app/Tygh/Mailer/AMessageBuilder.php
+++ b/app/Tygh/Mailer/AMessageBuilder.php
@@ -272,7 +272,7 @@ abstract class AMessageBuilder implements IMessageBuilder
             }
 
             if (!empty($from['name'])) {
-                $name = $from['name'];
+                $name = !empty($company[$from['name']]) ? $company[$from['name']] : $from['name'];