Peter M. Groen / knowledgetree

Commit afbdd74b578ad350cc1fded7840320938b88b232

Authored by kevin_fourie
1 parent d6ec0f70

Merged in from DEV trunk... 

KTS-3346
"KTPluginUtil dies horribly when a DB / pear error is returned"
Fixed. Added a check for pear error when getting the plugin helpers.

Committed by: Megan Watson
Reviewed by: Jonathan Byrne


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8439 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 6 additions and 0 deletions
lib/plugins/pluginutil.inc.php
  View file @afbdd74
@@ -172,6 +172,12 @@ class KTPluginUtil { @@ -172,6 +172,12 @@ class KTPluginUtil {
172 WHERE p.disabled = 0 AND h.classtype='plugin' ORDER BY p.orderby"; 172 WHERE p.disabled = 0 AND h.classtype='plugin' ORDER BY p.orderby";
173 $aPluginHelpers = DBUtil::getResultArray($query); 173 $aPluginHelpers = DBUtil::getResultArray($query);
174 174
  175 + if(PEAR::isError($aPluginHelpers)){
  176 + global $default;
  177 + $default->log->debug('Error in pluginutil: '.$aPluginHelpers->getMessage());
  178 + return false;
  179 + }
  180 +
175 // Check that there are plugins and if not, register them 181 // Check that there are plugins and if not, register them
176 if (empty($aPluginHelpers)) { 182 if (empty($aPluginHelpers)) {
177 KTPluginUtil::registerPlugins(); 183 KTPluginUtil::registerPlugins();