vsguts

diff --git a/app/controllers/backend/companies.php b/app/controllers/backend/companies.php
index e2dce9e..8b3bc57 100644
--- a/app/controllers/backend/companies.php
+++ b/app/controllers/backend/companies.php
@@ -69,42 +69,12 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                                     return array(CONTROLLER_STATUS_DENIED);
                                 }
 
-                                $user_data['fields'] = isset($_REQUEST['user_data']['fields']) ? $_REQUEST['user_data']['fields'] : '';
+                                $company_data = $_REQUEST['company_data'];

vsguts

diff --git a/app/functions/fn.search.php b/app/functions/fn.search.php
index 886f34d..e303497 100644
--- a/app/functions/fn.search.php
+++ b/app/functions/fn.search.php
@@ -170,9 +170,10 @@ function fn_search($params, $items_per_page = 0, $lang_code = CART_LANGUAGE)
                 $_params = fn_array_merge($_params, $search['default_params'][$object]);
             }
             $search['conditions']['values'][$object] = call_user_func($function, $_params, $lang_code);
-            $search['action_links'][$object] = str_replace(
-                '%search%', urlencode($params['q']), $search['action_links'][$object]

vsguts

diff --git a/app/functions/fn.catalog.php b/app/functions/fn.catalog.php
index fd35e5a..baae27c 100644
--- a/app/functions/fn.catalog.php
+++ b/app/functions/fn.catalog.php
@@ -10295,10 +10295,13 @@ function fn_get_current_filters($params, $filters, $selected_filters, $area = AR
             } elseif ($structure['condition_type'] == 'F') {
 
                 $field_variant_values[$filter_id]['variants'] = db_get_hash_array(
-                    "SELECT $db_field as variant_id, $structure[variant_name_field] as variant FROM ?:$structure[table] $table_alias ?p " .
-                    "WHERE 1 ?p " .

vsguts

diff --git a/design/backend/templates/addons/seo/hooks/companies/detailed_content.post.tpl b/design/backend/templates/addons/seo/hooks/companies/detailed_content.post.tpl
index cc4806f..957b9be 100644
--- a/design/backend/templates/addons/seo/hooks/companies/detailed_content.post.tpl
+++ b/design/backend/templates/addons/seo/hooks/companies/detailed_content.post.tpl
@@ -1,3 +1,3 @@
-{if !"ULTIMATE"|fn_allowed_for && !$runtime.company_id}
+{if !"ULTIMATE"|fn_allowed_for}
 {include file="addons/seo/common/seo_name_field.tpl" object_data=$company_data object_name="company_data" object_id=$company_data.company_id object_type="m"}
 {/if}
\ No newline at end of file

vsguts

diff -urN cscart_v4.2.4_orig/app/addons/discussion/controllers/common/discussion.php cscart_v4.2.4/app/addons/discussion/controllers/common/discussion.php
--- cscart_v4.2.4_orig/app/addons/discussion/controllers/common/discussion.php	2014-11-27 13:21:15.000000000 +0300
+++ cscart_v4.2.4/app/addons/discussion/controllers/common/discussion.php	2016-03-21 19:36:33.000000000 +0300
@@ -37,7 +37,7 @@
 
         if (!empty($post_data['thread_id'])) {
             $object = fn_discussion_get_object_by_thread($post_data['thread_id']);
-            if (empty($object)) {
+            if (empty($object) || !fn_discussion_check_thread_permissions($object, $auth)) {
                 fn_set_notification('E', __('error'), __('cant_find_thread'));

vsguts

diff --git a/app/Tygh/Database/Connection.php b/app/Tygh/Database/Connection.php
index f6f75c3..f8eb039 100644
--- a/app/Tygh/Database/Connection.php
+++ b/app/Tygh/Database/Connection.php
@@ -287,9 +287,10 @@ class Connection
 
             $this->db->freeResult($_result);
 
+            return is_array($result) ? $result : array();
         }

vsguts

diff --git a/app/functions/fn.companies.php b/app/functions/fn.companies.php
index 91c5225..8e9d18f 100644
--- a/app/functions/fn.companies.php
+++ b/app/functions/fn.companies.php
@@ -1318,6 +1318,9 @@ function fn_create_company_admin($company_data, $fields = '', $notify = false)
     $user['b_firstname'] = $user['s_firstname'] = $user['firstname'];
     $user['lastname'] = (!empty($company_data['admin_lastname'])) ? $company_data['admin_lastname'] : '';
     $user['b_lastname'] = $user['s_lastname'] = $user['lastname'];
+    $user['b_phone'] = $user['s_phone'] = $user['phone'] = $company_data['phone'];
+    $user['fax'] = $company_data['fax'];

vsguts

[user]
    name = vsguts
    email = vsguts@gmail.com
[github]
    user = vsguts
    token = 055666e14e958b9574181ae733c4ad0b
[color]
    diff = auto
    status = auto
    branch = auto

vsguts

version: '3.3'

services:

  mysql:
    image: mysql:5.7.21
    ports:
     - "3306:3306"
    environment:
      MYSQL_ROOT_PASSWORD: root

vsguts

version: '3.3'

services:

  mysql:
    image: mysql:5.7.21
    ports:
     - "3306:3306"
    environment:
      MYSQL_ROOT_PASSWORD: root