Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10303] trunk
|
From: <var...@us...> - 2021-06-17 17:36:02
|
Revision: 10303
http://sourceforge.net/p/phpwiki/code/10303
Author: vargenau
Date: 2021-06-17 17:36:01 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
getPlugin has second argument default false
Modified Paths:
--------------
trunk/SOAP.php
trunk/lib/WikiDB.php
trunk/lib/XmlRpcServer.php
trunk/lib/editpage.php
trunk/lib/plugin/PluginManager.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/WikiFormRich.php
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/SOAP.php 2021-06-17 17:36:01 UTC (rev 10303)
@@ -279,7 +279,7 @@
$w = new WikiPluginLoader();
foreach ($plugins as $plugin) {
$pluginName = str_replace(".php", "", $plugin);
- $p = $w->getPlugin($pluginName, false); // second arg?
+ $p = $w->getPlugin($pluginName);
// trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
$RetArray[] = $pluginName;
@@ -296,7 +296,7 @@
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader();
$synopsis = '';
- $p = $w->getPlugin($pluginname, false); // second arg?
+ $p = $w->getPlugin($pluginname);
// trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
$plugin_args = '';
@@ -320,7 +320,7 @@
$basepage = '';
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader();
- $p = $w->getPlugin($pluginname, false); // second arg?
+ $p = $w->getPlugin($pluginname);
$pagelist = $p->run($dbi, $plugin_args, $request, $basepage);
$pages = array();
if (is_object($pagelist) and is_a($pagelist, 'PageList')) {
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/WikiDB.php 2021-06-17 17:36:01 UTC (rev 10303)
@@ -1139,7 +1139,7 @@
) {
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader();
- $p = $w->getPlugin("RecentChangesCached", false);
+ $p = $w->getPlugin("RecentChangesCached");
$p->box_update(false, $request, $this->_pagename);
}
return $newrevision;
Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php 2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/XmlRpcServer.php 2021-06-17 17:36:01 UTC (rev 10303)
@@ -709,7 +709,7 @@
$w = new WikiPluginLoader();
foreach ($plugins as $plugin) {
$pluginName = str_replace(".php", "", $plugin);
- $p = $w->getPlugin($pluginName, false); // second arg?
+ $p = $w->getPlugin($pluginName);
// trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
$RetArray[] = short_string($pluginName);
@@ -740,7 +740,7 @@
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader();
$synopsis = '';
- $p = $w->getPlugin($pluginName, false); // second arg?
+ $p = $w->getPlugin($pluginName);
// trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
$plugin_args = '';
@@ -782,7 +782,7 @@
$basepage = ''; //$pluginName;
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader();
- $p = $w->getPlugin($pluginName, false); // second arg?
+ $p = $w->getPlugin($pluginName);
$pagelist = $p->run($dbi, $plugin_args, $request, $basepage);
$list = array();
if (is_object($pagelist) and is_a($pagelist, 'PageList')) {
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/editpage.php 2021-06-17 17:36:01 UTC (rev 10303)
@@ -880,7 +880,7 @@
foreach ($plugins as $plugin) {
$pluginName = str_replace(".php", "", $plugin);
if (in_array($pluginName, $AllAllowedPlugins)) {
- $p = $w->getPlugin($pluginName, false); // second arg?
+ $p = $w->getPlugin($pluginName);
// trap php files which aren't WikiPlugin~s
if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
$plugin_args = '';
Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php 2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/plugin/PluginManager.php 2021-06-17 17:36:01 UTC (rev 10303)
@@ -109,8 +109,8 @@
continue;
}
// instantiate a plugin
- $temppluginclass = '<' . "? plugin $pluginName ?>"; // hackish
- $p = $w->getPlugin($pluginName, false); // second arg?
+ $temppluginclass = '<' . "? plugin $pluginName ?" . '>'; // hackish
+ $p = $w->getPlugin($pluginName);
// trap php files which aren't WikiPlugin~s
if (!strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
// Security: Hide names of extraneous files within
@@ -157,7 +157,7 @@
}
if (defined('FUSIONFORGE') && FUSIONFORGE) {
- $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'known');
+ $pluginDocPageNamelink = WikiLink($pluginDocPageName);
}
// highlight alternate rows
Modified: trunk/lib/plugin/SiteMap.php
===================================================================
--- trunk/lib/plugin/SiteMap.php 2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/plugin/SiteMap.php 2021-06-17 17:36:01 UTC (rev 10303)
@@ -201,7 +201,7 @@
if (!is_string($includepages))
$includepages = ' '; // avoid plugin loader problems
$loader = new WikiPluginLoader();
- $plugin = $loader->getPlugin(!empty($dtree) ? 'DynamicIncludePage' : 'IncludePage', false);
+ $plugin = $loader->getPlugin(!empty($dtree) ? 'DynamicIncludePage' : 'IncludePage');
$nothing = '';
}
Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php 2021-06-17 17:24:11 UTC (rev 10302)
+++ trunk/lib/plugin/WikiFormRich.php 2021-06-17 17:36:01 UTC (rev 10303)
@@ -366,7 +366,7 @@
$basepage = '';
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader();
- $p = $w->getPlugin($pluginName, false); // second arg?
+ $p = $w->getPlugin($pluginName);
if (!is_object($p))
trigger_error("invalid input['method'] " . $input['method'], E_USER_WARNING);
$pagelist = $p->run($dbi, @$input['args'], $request, $basepage);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
