Changeset 836:3a54ff018a83

Timestamp:

05/31/12 12:45:38 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Message:

Updated '0' handling in several blog methods, fixes #1302

File:

• inc/core/class.dc.blog.php (modified) (8 diffs)

inc/core/class.dc.blog.php

@@ -317 +317 @@
           
           # We need to apply filter after counting
-          if (!empty($params['cat_id']))
+          if (isset($params['cat_id']) && $params['cat_id'] !== '')
           {
                $found = false;
@@ -332 +332 @@
           }
           
-          if (!empty($params['cat_url']) && empty($params['cat_id']))
+          if (isset($params['cat_url']) && ($params['cat_url'] !== '') 
+               && !isset($params['cat_id']))
           {
                $found = false;
@@ -745 +746 @@
           }
           
-          if (!empty($params['post_id'])) {
+          if (isset($params['post_id']) && $params['post_id'] !== '') {
                if (is_array($params['post_id'])) {
                     array_walk($params['post_id'],create_function('&$v,$k','if($v!==null){$v=(integer)$v;}'));
@@ -754 +755 @@
           }
           
-          if (!empty($params['post_url'])) {
+          if (isset($params['post_url']) && $params['post_url'] !== '') {
                $strReq .= "AND post_url = '".$this->con->escape($params['post_url'])."' ";
           }
@@ -762 +763 @@
           }
           
-          if (!empty($params['cat_id']))
+          if (isset($params['cat_id']) && $params['cat_id'] !== '')
           {
                if (!is_array($params['cat_id'])) {
@@ -772 +773 @@
                $strReq .= 'AND '.$this->getPostsCategoryFilter($params['cat_id'],'cat_id').' ';
           }
-          elseif (!empty($params['cat_url']))
+          elseif (isset($params['cat_url']) && $params['cat_url'] !== '')
           {
                if (!is_array($params['cat_url'])) {
@@ -1009 +1010 @@
           $cat_field = $catReq = $limit = '';
           
-          if (!empty($params['cat_id'])) {
+          if (isset($params['cat_id']) && $params['cat_id'] !== '') {
                $catReq = 'AND P.cat_id = '.(integer) $params['cat_id'].' ';
                $cat_field = ', C.cat_url ';
-          } elseif (!empty($params['cat_url'])) {
+          } elseif (isset($params['cat_url']) && $params['cat_url'] !== '') {
                $catReq = "AND C.cat_url = '".$this->con->escape($params['cat_url'])."' ";
                $cat_field = ', C.cat_url ';
@@ -1804 +1805 @@
           }
           
-          if (!empty($params['post_id'])) {
+          if (isset($params['post_id']) && $params['post_id'] !== '') {
                $strReq .= 'AND P.post_id = '.(integer) $params['post_id'].' ';
           }
           
-          if (!empty($params['cat_id'])) {
+          if (isset($params['cat_id']) && $params['cat_id'] !== '') {
                $strReq .= 'AND P.cat_id = '.(integer) $params['cat_id'].' ';
           }
           
-          if (!empty($params['comment_id'])) {
+          if (isset($params['comment_id']) && $params['comment_id'] !== '') {
                $strReq .= 'AND comment_id = '.(integer) $params['comment_id'].' ';
           }