Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9053] trunk/lib
|
From: <var...@us...> - 2014-08-27 08:28:23
|
Revision: 9053
http://sourceforge.net/p/phpwiki/code/9053
Author: vargenau
Date: 2014-08-27 08:28:20 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
protected function embedMap
Modified Paths:
--------------
trunk/lib/PageType.php
trunk/lib/WikiPluginCached.php
trunk/lib/editpage.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/GoTo.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/WikiTranslation.php
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/PageType.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -561,7 +561,7 @@
$pdf = new PDF();
$pdf->SetTitle($pagename);
$pdf->SetAuthor($this->_page->get('author'));
- $pdf->SetCreator(WikiURL($pagename, false, 1));
+ $pdf->SetCreator(WikiURL($pagename, array(), 1));
$pdf->AliasNbPages();
$pdf->AddPage();
//TODO: define fonts
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/WikiPluginCached.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -411,7 +411,7 @@
* @param $request Request
* @return string html output
*/
- private function embedMap($id, $url, $map, &$dbi, $argarray, &$request)
+ protected function embedMap($id, $url, $map, &$dbi, $argarray, &$request)
{
// id is not unique if the same map is produced twice
$key = substr($id, 0, 8) . substr(microtime(), 0, 6);
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/editpage.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -718,7 +718,7 @@
private function _redirectToBrowsePage()
{
- $this->request->redirect(WikiURL($this->page, false, 'absolute_url'));
+ $this->request->redirect(WikiURL($this->page, array(), 'absolute_url'));
}
function _restoreState()
Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/AppendText.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -78,7 +78,7 @@
if (empty($args['s'])) {
if ($request->isPost()) {
if ($pagename != _("AppendText"))
- return HTML($request->redirect(WikiURL($pagename, false, 'absurl'), false));
+ return HTML($request->redirect(WikiURL($pagename, array(), 'absurl'), false));
}
return HTML();
}
@@ -133,11 +133,11 @@
// TODO: Just invalidate the cache, if AppendText didn't
// change anything before.
//
- return $request->redirect(WikiURL($pagename, false, 'absurl'), false);
+ return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
// The user asked to be redirected to the modified page
} elseif ($args['redirect']) {
- return $request->redirect(WikiURL($pagename, false, 'absurl'), false);
+ return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
} else {
$link = HTML::em(WikiLink($pagename));
Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/DynamicIncludePage.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -48,7 +48,7 @@
function run($dbi, $argstr, &$request, $basepage)
{
global $WikiTheme;
- $args = $this->getArgs($argstr, $request, false);
+ $args = $this->getArgs($argstr, $request, array());
$page =& $args['page'];
if (ENABLE_AJAX) {
if ($args['state'])
Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/GoTo.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -54,7 +54,7 @@
$request->setArg('goto', false);
$target = $goto['target'];
if ($dbi->isWikiPage($target))
- $url = WikiURL($target, 0, 1);
+ $url = WikiURL($target, array(), 1);
else
$url = WikiURL($target, array('action' => 'edit'), 1);
Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/PageHistory.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -241,7 +241,7 @@
{
global $request;
- $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
+ $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
$title = sprintf(_("%s: %s"),
WIKI_NAME,
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/PhotoAlbum.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -181,7 +181,7 @@
$align = 'center';
}
if (count($photos) == 0) {
- return HTML::raw();
+ return HTML::raw('');
}
if (in_array("sort", $attributes))
Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/RandomPage.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -76,7 +76,7 @@
$page = $pagearray[array_rand($pagearray)];
$pagename = $page->getName();
if ($redirect)
- $request->redirect(WikiURL($pagename, false, 'absurl')); // noreturn
+ $request->redirect(WikiURL($pagename, array(), 'absurl')); // noreturn
if ($hidename)
return WikiLink($pagename, false, _("RandomPage"));
else
Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/RateIt.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -283,7 +283,7 @@
}
return $html;
}
- return HTML::raw();
+ return HTML::raw('');
}
// box is used to display a fixed-width, narrow version with common header
@@ -291,7 +291,7 @@
{
if (!$request) $request =& $GLOBALS['request'];
if (!$request->_user->isSignedIn()) {
- return HTML::raw();
+ return HTML::raw('');
}
if (!isset($args)) $args = array();
$args['small'] = 1;
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/RecentChanges.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -829,7 +829,7 @@
function pageURI($rev)
{
- return WikiURL($rev, '', 'absurl');
+ return WikiURL($rev, array(), 'absurl');
}
function format($changes)
@@ -878,7 +878,7 @@
return false;
return array('title' => WIKI_NAME,
- 'link' => WikiURL(HOME_PAGE, false, 'absurl'),
+ 'link' => WikiURL(HOME_PAGE, array(), 'absurl'),
'url' => $img_url);
}
@@ -887,14 +887,14 @@
return array('title' => _("Search"),
'description' => _("Title Search"),
'name' => 's',
- 'link' => WikiURL(_("TitleSearch"), false, 'absurl'));
+ 'link' => WikiURL(_("TitleSearch"), array(), 'absurl'));
}
function channel_properties()
{
global $request;
- $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
+ $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
extract($this->_args);
$title = WIKI_NAME;
$description = $this->title();
@@ -1029,7 +1029,7 @@
$rss = new AtomFeed;
// "channel" is called "feed" in atom
- $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
+ $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
extract($this->_args);
$description = $this->title();
$feed_props = array('title' => $description,
@@ -1089,9 +1089,8 @@
class NonDeletedRevisionIterator extends WikiDB_PageRevisionIterator
{
/**
- * @param $revisions object a WikiDB_PageRevisionIterator.
+ * @param WikiDB_PageRevisionIterator $revisions
* @param bool $check_current_revision
- * @return void
*/
function __construct($revisions, $check_current_revision = true)
{
@@ -1301,7 +1300,7 @@
);
}
- function getArgs($argstr, $request, $defaults = false)
+ function getArgs($argstr, $request = false, $defaults = array())
{
if (!$defaults) $defaults = $this->getDefaultArguments();
$args = WikiPlugin::getArgs($argstr, $request, $defaults);
Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/TitleSearch.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -103,7 +103,7 @@
if ($args['auto_redirect'] && ($pagelist->getTotal() == 1)) {
$page = $pagelist->first();
- $request->redirect(WikiURL($page->getName(), false, 'absurl'), false);
+ $request->redirect(WikiURL($page->getName(), array(), 'absurl'), false);
}
return $pagelist;
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WatchPage.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -143,8 +143,7 @@
return '';
}
if ($request->getArg('edit')) {
- $request->redirect(WikiURL(_("UserPreferences"),
- false, 'absolute_url')); // noreturn
+ $request->redirect(WikiURL(_("UserPreferences"), array(), 'absolute_url')); // noreturn
return '';
}
$add = $request->getArg('add');
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WikiAdminUtils.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -295,7 +295,7 @@
Button('cancel', _("Cancel")))
);
}
- return HTML::raw();
+ return HTML::raw('');
}
}
Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WikiPoll.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -70,7 +70,7 @@
);
}
- function getArgs($argstr, $request = false, $defaults = false)
+ function getArgs($argstr, $request = false, $defaults = array())
{
if ($defaults === false)
$defaults = $this->getDefaultArguments();
Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php 2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WikiTranslation.php 2014-08-27 08:28:20 UTC (rev 9053)
@@ -393,14 +393,14 @@
if (in_array($from_lang, array('en', 'fr'))) {
$url = "http://translate.google.com/translate";
$url .= "?langpair=" . urlencode($from_lang . "|" . $to_lang);
- $url .= "&u=" . urlencode(WikiURL($pagename, false, true));
+ $url .= "&u=" . urlencode(WikiURL($pagename, array(), true));
}
// redirect or transclude?
if ($url) {
return $request->redirect($url);
}
return HTML(fmt("TODO: Google can only translate from english and french. Find a translation service for %s to language %s",
- WikiURL($pagename, false, true),
+ WikiURL($pagename, array(), true),
$to_lang));
} else {
return $this->error(fmt("%s is empty.", $pagename));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
