Merge branch 'master' of github.com:splitbrain/dokuwiki-plugin-ditaa

splitbrain · Jun 7, 2010 · 34e9c7a · 34e9c7a
2 parents 4660590 + 3c74ed3
commit 34e9c7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ditaa.php b/ditaa.php
@@ -4,7 +4,7 @@
  * @author     Andreas Gohr <gohr@cosmocode.de>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
 define('NOSESSION',true);
 require_once(DOKU_INC.'inc/init.php');
 require_once(DOKU_INC.'inc/pageutils.php');

diff --git a/syntax.php b/syntax.php
@@ -150,7 +150,12 @@ function _run($data,$cache) {
         exec($cmd, $output, $error);
         @unlink($temp);
 
-        if ($error != 0) return false;
+        if ($error != 0){
+            if($conf['debug']){
+                dbglog(join("\n",$output),'ditaa command failed: '.$cmd);
+            }
+            return false;
+        }
         return true;
     }