From: <var...@us...> - 2012-12-06 18:05:32
|
Revision: 8617 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8617&view=rev Author: vargenau Date: 2012-12-06 17:54:15 +0000 (Thu, 06 Dec 2012) Log Message: ----------- Fix return Modified Paths: -------------- trunk/lib/WikiPlugin.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2012-12-06 17:52:46 UTC (rev 8616) +++ trunk/lib/WikiPlugin.php 2012-12-06 17:54:15 UTC (rev 8617) @@ -471,6 +471,7 @@ case 'plugin-form': return $plugin->makeForm($plugin_args, $request); } + return false; } function getWikiPageLinks($pi, $basepage) @@ -514,7 +515,7 @@ $plugin_class = "WikiPlugin_$plugin_name"; if (!class_exists($plugin_class)) { // $include_failed = !@include_once("lib/plugin/$plugin_name.php"); - $include_failed = !include_once("lib/plugin/$plugin_name.php"); + $include_failed = !include_once($plugin_source); $ErrorManager->popErrorHandler(); if (!class_exists($plugin_class)) { Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2012-12-06 17:52:46 UTC (rev 8616) +++ trunk/lib/WikiPluginCached.php 2012-12-06 17:54:15 UTC (rev 8617) @@ -1090,10 +1090,11 @@ fclose($pipes[2]); // It is important that you close any pipes before calling // proc_close in order to avoid a deadlock - $return_value = proc_close($process); + proc_close($process); if (empty($buf)) printXML($this->error($stderr)); return $buf; } + return ''; } // run "echo $source | $commandLine" and return result Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2012-12-06 17:52:46 UTC (rev 8616) +++ trunk/lib/WikiTheme.php 2012-12-06 17:54:15 UTC (rev 8617) @@ -68,7 +68,6 @@ $page = $page_or_rev->getPage(); $pagename = $page->getName(); $wikipage = $pagename; - $exists = true; } elseif (isa($page_or_rev, 'WikiDB_Page')) { $page = $page_or_rev; $pagename = $page->getName(); @@ -269,7 +268,9 @@ } elseif (!$missing_okay) { trigger_error("$this->_theme/$file: not found", E_USER_NOTICE); if (DEBUG & _DEBUG_TRACE) { - echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n"; + echo "<pre>"; + printSimpleTrace(debug_backtrace()); + echo "</pre>\n"; } } return false; @@ -526,6 +527,7 @@ else return fmt("Owner: %s", '"' . $owner . '"'); } + return ''; } /* New behaviour: (by Matt Brown) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |