Index: modules/in-link/admin_templates/links/links_categories.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/in-link/admin_templates/links/links_categories.tpl (revision 15972)
+++ modules/in-link/admin_templates/links/links_categories.tpl (revision )
@@ -76,7 +76,7 @@
-
+
\ No newline at end of file
Index: modules/in-commerce/units/products/products_event_handler.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/in-commerce/units/products/products_event_handler.php (revision 15971)
+++ modules/in-commerce/units/products/products_event_handler.php (revision )
@@ -693,7 +693,7 @@
$user_id = $this->Application->RecallVar('user_id');
- $sql = ' SELECT * FROM ' . TABLE_PREFIX . 'SpamControl
+ $sql = ' SELECT Id, Expire FROM ' . TABLE_PREFIX . 'SpamControl
WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
AND IPaddress="' . $this->Application->getClientIp() . '"
AND PortalUserId=' . $user_id . '
@@ -702,10 +702,7 @@
if ( $res && $res['Expire'] < time() ) {
$sql = ' DELETE FROM ' . TABLE_PREFIX . 'SpamControl
- WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
- AND IPaddress="' . $this->Application->getClientIp() . '"
- AND PortalUserId=' . $user_id . '
- AND DataType="Rating"';
+ WHERE Id= ' . $res['Id'];
$this->Conn->Query($sql);
unset($res);
}
@@ -938,7 +935,11 @@
'MembershipExpires' => $expire,
);
- $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations', 'REPLACE');
+ if ( isset($user_groups[$group_id]) ) {
+ $this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'UserGroupRelations', 'Id = ' . $user_groups['Id']);
+ } else {
+ $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations');
+ }
$sub_order = $this->Application->recallObject('ord.-sub'.$event->getEventParam('next_sub_number'), 'ord');
$sub_order->SetDBField('IsRecurringBilling', getArrayValue($item_data, 'IsRecurringBilling') ? 1 : 0);
\ No newline at end of file
Index: modules/in-bulletin/admin_templates/topics/topics_categories.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/in-bulletin/admin_templates/topics/topics_categories.tpl (revision 15971)
+++ modules/in-bulletin/admin_templates/topics/topics_categories.tpl (revision )
@@ -76,7 +76,7 @@
-
+
\ No newline at end of file
Index: modules/in-commerce/admin_templates/products/products_categories.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/in-commerce/admin_templates/products/products_categories.tpl (revision 15971)
+++ modules/in-commerce/admin_templates/products/products_categories.tpl (revision )
@@ -76,7 +76,7 @@
-
+
\ No newline at end of file
Index: modules/in-news/admin_templates/articles/articles_categories.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/in-news/admin_templates/articles/articles_categories.tpl (revision 15973)
+++ modules/in-news/admin_templates/articles/articles_categories.tpl (revision )
@@ -76,7 +76,7 @@
-
+
\ No newline at end of file