From 6c30922d9810a9bffa4e5839ec0367e7ad82335c Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 26 Apr 2013 13:53:49 +0000 Subject: [PATCH] Add () for new WikiPluginLoader git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8775 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- SOAP.php | 6 +++--- lib/CachedMarkup.php | 2 +- lib/EditToolbar.php | 2 +- lib/Template.php | 2 +- lib/WikiDB.php | 2 +- lib/WikiPluginCached.php | 2 +- lib/XmlRpcServer.php | 6 +++--- lib/display.php | 2 +- lib/plugin/InterWikiSearch.php | 2 +- lib/plugin/PluginManager.php | 2 +- lib/plugin/RecentChangesCached.php | 2 +- lib/plugin/SystemInfo.php | 2 +- lib/plugin/WikiFormRich.php | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SOAP.php b/SOAP.php index 37e2996db..1611a592d 100644 --- a/SOAP.php +++ b/SOAP.php @@ -275,7 +275,7 @@ function listPlugins($credentials = false) $RetArray = array(); if (!empty($plugins)) { require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); $p = $w->getPlugin($pluginName, false); // second arg? @@ -293,7 +293,7 @@ function getPluginSynopsis($pluginname, $credentials = false) global $server; checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin"); require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $synopsis = ''; $p = $w->getPlugin($pluginName, false); // second arg? // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only @@ -319,7 +319,7 @@ function callPlugin($pluginname, $pluginargs, $credentials = false) $basepage = ''; ; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin($pluginName, false); // second arg? $pagelist = $p->run($dbi, $pluginargs, $request, $basepage); $pages = array(); diff --git a/lib/CachedMarkup.php b/lib/CachedMarkup.php index 840713972..da285fef6 100644 --- a/lib/CachedMarkup.php +++ b/lib/CachedMarkup.php @@ -863,7 +863,7 @@ class Cached_PluginInvocation extends Cached_DynamicContent if (!$loader) { include_once 'lib/WikiPlugin.php'; - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); } return $loader; } diff --git a/lib/EditToolbar.php b/lib/EditToolbar.php index 3622cf858..e3ce326cd 100644 --- a/lib/EditToolbar.php +++ b/lib/EditToolbar.php @@ -346,7 +346,7 @@ msg_repl_close = '" . _("Close") . "' if (!empty($plugins)) { $plugin_js = ''; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); if (in_array($pluginName, $AllAllowedPlugins)) { diff --git a/lib/Template.php b/lib/Template.php index c3d2e7633..df77de37d 100644 --- a/lib/Template.php +++ b/lib/Template.php @@ -84,7 +84,7 @@ class Template static $loader; if (empty($loader)) - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); $this->_print($loader->expandPI($pi, $this->_request, $this, $this->_basepage)); } diff --git a/lib/WikiDB.php b/lib/WikiDB.php index 6ff9f608f..4f17e206b 100644 --- a/lib/WikiDB.php +++ b/lib/WikiDB.php @@ -1089,7 +1089,7 @@ class WikiDB_Page array('loadfile', 'upgrade')) ) { require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin("RecentChangesCached", false); $p->box_update(false, $GLOBALS['request'], $this->_pagename); } diff --git a/lib/WikiPluginCached.php b/lib/WikiPluginCached.php index b9d3600c7..3248d6252 100644 --- a/lib/WikiPluginCached.php +++ b/lib/WikiPluginCached.php @@ -861,7 +861,7 @@ class WikiPluginCached extends WikiPlugin $pluginname = $plugincall['pluginname']; $argarray = $plugincall['arguments']; - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); $plugin = $loader->getPlugin($pluginname); // cache empty, but image maps have to be created _inline_ diff --git a/lib/XmlRpcServer.php b/lib/XmlRpcServer.php index eb3a98c1b..3cf40a15f 100644 --- a/lib/XmlRpcServer.php +++ b/lib/XmlRpcServer.php @@ -709,7 +709,7 @@ function listPlugins($params) $RetArray = array(); if (!empty($plugins)) { require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); $p = $w->getPlugin($pluginName, false); // second arg? @@ -741,7 +741,7 @@ function getPluginSynopsis($params) $pluginName = short_string_decode($ParamPlugin->scalarval()); require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $synopsis = ''; $p = $w->getPlugin($pluginName, false); // second arg? // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only @@ -784,7 +784,7 @@ function callPlugin($params) $basepage = ''; //$pluginName; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin($pluginName, false); // second arg? $pagelist = $p->run($dbi, $plugin_args, $request, $basepage); $list = array(); diff --git a/lib/display.php b/lib/display.php index be14f7da8..a804aa3f7 100644 --- a/lib/display.php +++ b/lib/display.php @@ -129,7 +129,7 @@ function actionPage(&$request, $action) // Need the pagelist from the first plugin foreach ($transformedContent->_content as $cached_element) { if (is_a($cached_element, "Cached_PluginInvocation")) { - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); $markup = null; // return the first found pagelist $pagelist = $loader->expandPI($cached_element->_pi, $request, diff --git a/lib/plugin/InterWikiSearch.php b/lib/plugin/InterWikiSearch.php index 9542406a8..b7c69d026 100644 --- a/lib/plugin/InterWikiSearch.php +++ b/lib/plugin/InterWikiSearch.php @@ -106,7 +106,7 @@ if (defined('DEBUG') && DEBUG) { ? WikiLink($moniker) : $moniker); - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin('ExternalSearch'); $argstr = sprintf('url="%s"', addslashes($interurl)); $searchtd = HTML::td($p->run($dbi, $argstr, $request, $basepage)); diff --git a/lib/plugin/PluginManager.php b/lib/plugin/PluginManager.php index 6a48e7ac1..8e5833aaa 100644 --- a/lib/plugin/PluginManager.php +++ b/lib/plugin/PluginManager.php @@ -97,7 +97,7 @@ class WikiPlugin_PluginManager $tbody = HTML::tbody(); $row_no = 0; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $pluginName) { $pluginName = str_replace(".php", "", $pluginName); diff --git a/lib/plugin/RecentChangesCached.php b/lib/plugin/RecentChangesCached.php index f394c6040..914c17ca1 100644 --- a/lib/plugin/RecentChangesCached.php +++ b/lib/plugin/RecentChangesCached.php @@ -67,7 +67,7 @@ class WikiPlugin_RecentChangesCached $changes = $plugin->getChanges($dbi, $args); return $plugin->format($changes, $args); /* - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); return $loader->expandPI('', $request, $this, $basepage); diff --git a/lib/plugin/SystemInfo.php b/lib/plugin/SystemInfo.php index 5b93dd476..e647cd077 100644 --- a/lib/plugin/SystemInfo.php +++ b/lib/plugin/SystemInfo.php @@ -78,7 +78,7 @@ class WikiPlugin_SystemInfo function getHtml($dbi, $argarray, $request, $basepage) { - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); return $loader->expandPI('<', $request, $this, $basepage); diff --git a/lib/plugin/WikiFormRich.php b/lib/plugin/WikiFormRich.php index da51fe73e..8f1fb2e03 100644 --- a/lib/plugin/WikiFormRich.php +++ b/lib/plugin/WikiFormRich.php @@ -358,7 +358,7 @@ class WikiPlugin_WikiFormRich $pluginName = substr($input['method'], 7); $basepage = ''; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin($pluginName, false); // second arg? if (!is_object($p)) trigger_error("invalid input['method'] " . $input['method'], E_USER_WARNING); -- 2.42.0