Commit 365ad03c3e32df3f9d4292174e8b0db0ce1b3489
1 parent
e1b50e32
Merged in from DEV trunk...
KTS-3400 'An error occurred in KTInfoDashlet::is_active()' Fixed. PEAR Error return was unchecked. Committed By: Donald Jackson Reviewed By: Isaac Lundall git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8926 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
6 additions
and
1 deletions
plugins/ktcore/KTDashlets.php
| @@ -94,8 +94,13 @@ class KTInfoDashlet extends KTBaseDashlet { | @@ -94,8 +94,13 @@ class KTInfoDashlet extends KTBaseDashlet { | ||
| 94 | return false; | 94 | return false; |
| 95 | } | 95 | } |
| 96 | } else { | 96 | } else { |
| 97 | - // We now check for substitute help files. try to generate an error. | 97 | + // We now check for substitute help files. try to generate an error.\ |
| 98 | + // This function can return a PEAR Error object, we will need to check it | ||
| 98 | $aHelpInfo = KTHelp::getHelpInfo($this->helpLocation); | 99 | $aHelpInfo = KTHelp::getHelpInfo($this->helpLocation); |
| 100 | + if(PEAR::isError($aHelpInfo)) | ||
| 101 | + { | ||
| 102 | + return false; | ||
| 103 | + } | ||
| 99 | } | 104 | } |
| 100 | 105 | ||
| 101 | // NORMAL users never see edit-option. | 106 | // NORMAL users never see edit-option. |