Merge remote-tracking branch 'nukeviet/develop'

nukeviet · Oct 24, 2017 · 192d2df · 192d2df
2 parents 9ef360e + a23e861
commit 192d2df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/modules/banners/admin/add_banner.php b/modules/banners/admin/add_banner.php
@@ -217,11 +217,14 @@
                 $id = $db->insert_id($_sql, 'id', $data_insert);
             }
         }
-        nv_insert_logs(NV_LANG_DATA, $module_name, 'log_add_banner', 'bannerid ' . $id, $admin_info['userid']);
-        nv_CreateXML_bannerPlan();
-        $nv_Cache->delMod($module_name);
-        $op2 = ($file_ext == 'swf') ? 'edit_banner' : 'info_banner';
-        nv_redirect_location(NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=' . $op2 . '&id=' . $id);
+
+        if (empty($error)) {
+            nv_insert_logs(NV_LANG_DATA, $module_name, 'log_add_banner', 'bannerid ' . $id, $admin_info['userid']);
+            nv_CreateXML_bannerPlan();
+            $nv_Cache->delMod($module_name);
+            $op2 = ($file_ext == 'swf') ? 'edit_banner' : 'info_banner';
+            nv_redirect_location(NV_BASE_ADMINURL . 'index.php?' . NV_LANG_VARIABLE . '=' . NV_LANG_DATA . '&' . NV_NAME_VARIABLE . '=' . $module_name . '&' . NV_OP_VARIABLE . '=' . $op2 . '&id=' . $id);
+        }
     }
 } else {
     $pid = 0;

diff --git a/modules/news/blocks/global.block_new_comment.php b/modules/news/blocks/global.block_new_comment.php
@@ -55,7 +55,7 @@ function nv_comment_new($block_config)
         }
 
         if (!empty($array_news_id)) {
-            $result = $db_slave->query('SELECT t1.id, t1.alias AS alias_id, t2.alias AS alias_cat FROM ' . NV_PREFIXLANG . '_' . $mod_data . '_rows t1 INNER JOIN ' . NV_PREFIXLANG . '_' . $mod_data . '_cat t2 ON t1.catid = t2.catid WHERE t1.id IN (' . implode(',', array_unique($array_news_id)) . ') AND status = 1');
+            $result = $db_slave->query('SELECT t1.id, t1.alias AS alias_id, t2.alias AS alias_cat FROM ' . NV_PREFIXLANG . '_' . $mod_data . '_rows t1 INNER JOIN ' . NV_PREFIXLANG . '_' . $mod_data . '_cat t2 ON t1.catid = t2.catid WHERE t1.id IN (' . implode(',', array_unique($array_news_id)) . ') AND t1.status = 1');
             $array_news_id = array();
             while ($row = $result->fetch()) {
                 $array_news_id[$row['id']] = $row;