Peter M. Groen / knowledgetree

Commit 363835692c84a60d36be516ff13abff395ed3e67

Authored by nbm
1 parent b94bb18b

If the disclaimers plugin isn't loaded, handle that and don't print 

anything.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5418 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 13 additions and 7 deletions
lib/templating/kt3template.inc.php
  View file @3638356
... ... @@ -385,9 +385,13 @@ class KTPage {
385 385 }
386 386  
387 387 function getDisclaimer() {
388   - $oRegistry =& KTPluginRegistry::getSingleton();
389   - $oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
390   - return $oPlugin->getPageDisclaimer();
  388 + $oRegistry =& KTPluginRegistry::getSingleton();
  389 + $oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
  390 + if (!PEAR::isError($oPlugin) && !is_null($oPlugin)) {
  391 + return $oPlugin->getPageDisclaimer();
  392 + } else {
  393 + return;
  394 + }
391 395 }
392 396  
393 397 }
... ...
login.php
  View file @3638356
... ... @@ -81,10 +81,12 @@ class LoginPageDispatcher extends KTDispatcher {
81 81 }
82 82 $sLanguageSelect = $default->defaultLanguage;
83 83  
84   - // extra disclaimer, if plugin is enabled
85   - $oRegistry =& KTPluginRegistry::getSingleton();
86   - $oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
87   - $sDisclaimer = $oPlugin->getLoginDisclaimer();
  84 + // extra disclaimer, if plugin is enabled
  85 + $oRegistry =& KTPluginRegistry::getSingleton();
  86 + $oPlugin =& $oRegistry->getPlugin('ktstandard.disclaimers.plugin');
  87 + if (!PEAR::isError($oPlugin) && !is_null($oPlugin)) {
  88 + $sDisclaimer = $oPlugin->getLoginDisclaimer();
  89 + }
88 90  
89 91 $oTemplating =& KTTemplating::getSingleton();
90 92 $oTemplate = $oTemplating->loadTemplate("ktcore/login");
... ...