Merge pull request #614 from splitbrain/renderer_graceful_fallback_bugfix

Fix a couple of issues with PR#571

1 files changed, 2 insertions, 3 deletions

diff --git a/inc/parserutils.php b/inc/parserutils.php
index 06bd6dbb8..8244837e1 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -636,9 +636,9 @@ function p_get_renderer($mode) {
         return $Renderer;
     }
 
-    // not bundled, see if its an enabled plugin for rendering $mode
+    // not bundled, see if its an enabled renderer plugin & when $mode is 'xhtml', the renderer can supply that format.
     $Renderer = $plugin_controller->load('renderer',$rname);
-    if ($Renderer && is_a($Renderer, 'Doku_Renderer')  && ($mode == $Renderer->getFormat())) {
+    if ($Renderer && is_a($Renderer, 'Doku_Renderer')  && ($mode != 'xhtml' || $mode == $Renderer->getFormat())) {
         return $Renderer;
     }
 
@@ -660,7 +660,6 @@ function p_get_renderer($mode) {
     }
 
     // fallback failed, alert the world
-    trigger_error("Unable to resolve render class $rclass",E_USER_WARNING);
     msg("No renderer '$rname' found for mode '$mode'",-1);
     return null;
 }