[phpwiki-checkins] SF.net SVN: phpwiki:[8577] trunk

[<var...@us...>]

Revision: 8577
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8577&view=rev
Author:   vargenau
Date:     2012-11-30 14:49:10 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
GRAPHVIZ_EXE /usr/bin/dot

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/plugin/GraphViz.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/config/config-default.ini	2012-11-30 14:49:10 UTC (rev 8577)
@@ -182,7 +182,7 @@
 ; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
 EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
 BABYCART_PATH = /usr/local/bin/babycart
-; GRAPHVIZ_EXE = /usr/local/bin/dot
+; GRAPHVIZ_EXE = /usr/bin/dot
 
 PLUGIN_CACHED_DATABASE = file
 ; PLUGIN_CACHED_CACHE_DIR = /tmp/cache

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/config/config-dist.ini	2012-11-30 14:49:10 UTC (rev 8577)
@@ -1274,7 +1274,7 @@
 
 ; GraphViz plugin executable:
 ; http://www.graphviz.org/
-;GRAPHVIZ_EXE = /usr/local/bin/dot
+;GRAPHVIZ_EXE = /usr/bin/dot
 
 ; Default GD2 truetype font. For text2png, GraphViz, VisualWiki
 ; You might need the full path to the .ttf file

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/configurator.php	2012-11-30 14:49:10 UTC (rev 8577)
@@ -1644,7 +1644,7 @@
 $properties["RATEIT_IMGPREFIX"] =
     new _define_commented_optional('RATEIT_IMGPREFIX'); //BStar
 $properties["GRAPHVIZ_EXE"] =
-    new _define_commented_optional('GRAPHVIZ_EXE'); // /usr/local/bin/dot
+    new _define_commented_optional('GRAPHVIZ_EXE', "/usr/bin/dot");
 
 if (PHP_OS == "Darwin") // Mac OS X
     $ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/lib/plugin/GraphViz.php	2012-11-30 14:49:10 UTC (rev 8577)
@@ -56,7 +56,7 @@
         define('VISUALWIKIFONT', 'luximr');
 } else { // other os
     if (!defined("GRAPHVIZ_EXE"))
-        define('GRAPHVIZ_EXE', '/usr/local/bin/dot');
+        define('GRAPHVIZ_EXE', '/usr/bin/dot');
     // Name of the Truetypefont - Helvetica is probably easier to read
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'Helvetica');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.