Commit 2d3f10106df788a2cdf9e3243623debf876fc92e
1 parent
ba07100d
Merged in from DEV trunk...
KTS-3602 "Tag Cloud creates 2 fieldset entries" Fixed. Now returns the pear error instead of false when checking for the field and fieldset. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@9187 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
6 additions
and
2 deletions
plugins/tagcloud/TagCloudPlugin.php
| @@ -154,7 +154,9 @@ require_once(KT_LIB_DIR . '/templating/templating.inc.php'); | @@ -154,7 +154,9 @@ require_once(KT_LIB_DIR . '/templating/templating.inc.php'); | ||
| 154 | $sTag = DBUtil::getOneResultKey(array($sQuery), 'id'); | 154 | $sTag = DBUtil::getOneResultKey(array($sQuery), 'id'); |
| 155 | 155 | ||
| 156 | if (PEAR::isError($sTag)) { | 156 | if (PEAR::isError($sTag)) { |
| 157 | - return false; | 157 | + global $default; |
| 158 | + $default->log->error('Tag Cloud plugin - error checking tag field: '.$sTag->getMessage()); | ||
| 159 | + return $sTag; | ||
| 158 | } | 160 | } |
| 159 | if(is_numeric($sTag)){ | 161 | if(is_numeric($sTag)){ |
| 160 | return $sTag; | 162 | return $sTag; |
| @@ -174,7 +176,9 @@ require_once(KT_LIB_DIR . '/templating/templating.inc.php'); | @@ -174,7 +176,9 @@ require_once(KT_LIB_DIR . '/templating/templating.inc.php'); | ||
| 174 | $iFieldset = DBUtil::getOneResultKey(array($sQuery), 'id'); | 176 | $iFieldset = DBUtil::getOneResultKey(array($sQuery), 'id'); |
| 175 | 177 | ||
| 176 | if (PEAR::isError($iFieldset)) { | 178 | if (PEAR::isError($iFieldset)) { |
| 177 | - return false; | 179 | + global $default; |
| 180 | + $default->log->error('Tag Cloud plugin - error checking tag fieldset: '.$iFieldset->getMessage()); | ||
| 181 | + return $iFieldset; | ||
| 178 | } | 182 | } |
| 179 | if(is_numeric($iFieldset)){ | 183 | if(is_numeric($iFieldset)){ |
| 180 | return $iFieldset; | 184 | return $iFieldset; |