Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10281] trunk
|
From: <var...@us...> - 2021-06-10 08:07:28
|
Revision: 10281
http://sourceforge.net/p/phpwiki/code/10281
Author: vargenau
Date: 2021-06-10 08:07:22 +0000 (Thu, 10 Jun 2021)
Log Message:
-----------
Revert Subversion commit 9111, bad side effects; Bug#607 BackLinks do not work inside a RichTable; Bug#636 Recursive include is not trapped
Modified Paths:
--------------
trunk/lib/InlineParser.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/WikicreoleTable.php
trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/InlineParser.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -443,10 +443,6 @@
$pagename = $link;
$anchor = false;
}
-
- global $backlinks;
- $backlinks[] = array('linkto' => $pagename);
-
return new Cached_WikiLink($pagename, $label, $anchor);
}
}
Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/IncludePage.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -64,14 +64,7 @@
if (!$page or !$page->name)
return false;
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
-
- $backlinks[] = array('linkto' => $page->name);
- return $backlinks;
+ return array(array('linkto' => $page->name));
}
// Avoid warning in:
Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/MediawikiTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -65,16 +65,6 @@
return array();
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -84,10 +74,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/BlockParser.php';
// We allow the compact Mediawiki syntax with:
Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/OldStyleTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -68,16 +68,6 @@
return;
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -87,10 +77,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/InlineParser.php';
$args = $this->getArgs($argstr, $request);
Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/RichTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -42,16 +42,6 @@
return array();
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -61,10 +51,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/BlockParser.php';
$lines = preg_split('/\n/', $argstr);
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/Template.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -96,14 +96,7 @@
if (!$page or !$page->name)
return false;
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
-
- $backlinks[] = array('linkto' => $page->name);
- return $backlinks;
+ return array(array('linkto' => $page->name));
}
/**
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/WikicreoleTable.php 2021-06-10 08:07:22 UTC (rev 10281)
@@ -68,16 +68,6 @@
return;
}
- function getWikiPageLinks($argstr, $basepage)
- {
- global $backlinks;
- if (empty($backlinks)) {
- global $request;
- $this->run($request->_dbi, $argstr, $request, $basepage);
- }
- return $backlinks;
- }
-
/**
* @param WikiDB $dbi
* @param string $argstr
@@ -87,10 +77,6 @@
*/
function run($dbi, $argstr, &$request, $basepage)
{
- global $backlinks;
-
- $backlinks = array();
-
include_once 'lib/InlineParser.php';
$table = array();
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/pgsrc/ReleaseNotes 2021-06-10 08:07:22 UTC (rev 10281)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed, 9 Jun 2021 19:50:57 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -23,6 +23,9 @@
* Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
* Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
* Better check arguments for ~GoogleMaps plugin
+* Revert Subversion commit 9111, bad side effects:
+** Bug#607 BackLinks do not work inside a RichTable
+** Bug#636 Recursive include is not trapped
* Security fixes
=== Changes ===
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
