Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9710] trunk
|
From: <var...@us...> - 2015-07-10 14:21:01
|
Revision: 9710
http://sourceforge.net/p/phpwiki/code/9710
Author: vargenau
Date: 2015-07-10 14:20:58 +0000 (Fri, 10 Jul 2015)
Log Message:
-----------
Fix arguments
Modified Paths:
--------------
trunk/ImageTile.php
trunk/lib/DbaDatabase.php
trunk/lib/IniConfig.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/editpage.php
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/upgrade.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/themeinfo.php
trunk/themes/shamino_com/themeinfo.php
trunk/themes/wikilens/themeinfo.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/ImageTile.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -56,49 +56,49 @@
if (function_exists("imagecreatefromjpeg"))
$img = @imagecreatefromjpeg($file);
else
- show_plain($file);
+ show_plain();
break;
case '3':
if (function_exists("imagecreatefrompng"))
$img = @imagecreatefrompng($file);
else
- show_plain($file);
+ show_plain();
break;
case '1':
if (function_exists("imagecreatefromgif"))
$img = @imagecreatefromgif($file);
else
- show_plain($file);
+ show_plain();
break;
case '15':
if (function_exists("imagecreatefromwbmp"))
$img = @imagecreatefromwbmp($file);
else
- show_plain($file);
+ show_plain();
break;
case '16':
if (function_exists("imagecreatefromxbm"))
$img = @imagecreatefromxbm($file);
else
- show_plain($file);
+ show_plain();
break;
case 'xpm':
if (function_exists("imagecreatefromxpm"))
$img = @imagecreatefromxpm($file);
else
- show_plain($file);
+ show_plain();
break;
case 'gd':
if (function_exists("imagecreatefromgd"))
$img = @imagecreatefromgd($file);
else
- show_plain($file);
+ show_plain();
break;
case 'gd2':
if (function_exists("imagecreatefromgd2"))
$img = @imagecreatefromgd2($file);
else
- show_plain($file);
+ show_plain();
break;
default:
//we are not stupid...
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/DbaDatabase.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -223,7 +223,7 @@
function _dump()
{
$dbh = &$this->_dbh;
- for ($key = $this->firstkey($dbh); $key; $key = $this->nextkey($dbh))
+ for ($key = $this->firstkey(); $key; $key = $this->nextkey())
printf("%10s: %s\n", $key, $this->fetch($key));
}
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/IniConfig.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -117,7 +117,7 @@
// Optionally check config/config.php dump for faster startup
$dump = substr($file, 0, -3) . "php";
- if (isWindows($dump)) $dump = str_replace("/", "\\", $dump);
+ if (isWindows()) $dump = str_replace("/", "\\", $dump);
if (file_exists($dump) and is_readable($dump) and filesize($dump) > 0 and sort_file_mtime($dump, $file) < 0) {
@include($dump) or die("Error including " . $dump);
if (function_exists('wiki_configrestore') and (wiki_configrestore() === 'noerr')) {
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/WikiTheme.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -1438,7 +1438,7 @@
// This allows one to manually select "Printer" style (when browsing page)
// to see what the printer style looks like.
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/WikiUser/OpenID.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -247,7 +247,7 @@
}
// no quotes and shorter than 128
- function isValidName()
+ function isValidName($userid = false)
{
if (!$this->_userid) return false;
return !preg_match('/[\"\']/', $this->_userid) and strlen($this->_userid) < 128;
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/editpage.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -427,9 +427,7 @@
// This will probably prevent from discussing sex or viagra related topics. So beware.
if (ENABLE_SPAMASSASSIN) {
require_once 'lib/spam_babycart.php';
- if ($babycart = check_babycart($newtext, $request->get("REMOTE_ADDR"),
- $this->user->getId())
- ) {
+ if ($babycart = check_babycart($newtext, $request->get("REMOTE_ADDR"))) {
// TODO: mail the admin
if (is_array($babycart))
$this->tokens['PAGE_LOCKED_MESSAGE'] =
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/plugin/DebugBackendInfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -103,7 +103,7 @@
$linkdata = $backend->get_links($page, false);
if ($linkdata->count())
$table->pushContent($this->_showhash("get_links('$page')", $linkdata->asArray()));
- $relations = $backend->get_links($page, false, false, false, false, false, true);
+ $relations = $backend->get_links($page, false, false, false, false, false);
if ($relations->count()) {
$table->pushContent($this->_showhash("get_relations('$page')", array()));
while ($rel = $relations->next())
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/plugin/SpellCheck.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -86,8 +86,7 @@
$words = preg_split('/[\W]+?/', $text);
$misspelled = $return = array();
- $pspell_config = pspell_config_create($lang, "", "", 'UTF-8',
- PSPELL_NORMAL | PSPELL_RUN_TOGETHER);
+ $pspell_config = pspell_config_create($lang, "", "", 'UTF-8');
//pspell_config_runtogether($pspell_config, true);
if (PSPELL_PWL)
pspell_config_personal($pspell_config, PSPELL_PWL);
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/plugin/WikiAdminPurge.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -37,7 +37,7 @@
/* getDefaultArguments() is inherited from WikiAdminSelect class */
- protected function collectPages(&$list, &$dbi, $sortby, $limit = 0)
+ protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '')
{
$allPages = $dbi->getAllPages('include_empty', $sortby, $limit);
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/plugin/WikiAdminRemove.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -68,7 +68,7 @@
));
}
- protected function collectPages(&$list, &$dbi, $sortby, $limit = 0)
+ protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '')
{
extract($this->_args);
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/plugin/WikiBlog.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -101,7 +101,7 @@
$request->setArg("edit", false);
if ($request->isPost() and !empty($blog['save'])) {
- $this->add($request, $blog, 'wikiblog', $basepage); // noreturn
+ $this->add($request, $blog, 'wikiblog'); // noreturn
}
//TODO: preview
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/lib/upgrade.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -1199,14 +1199,14 @@
StartLoadDump($request, _("Upgrading this PhpWiki"));
$upgrade = new Upgrade($request);
if (!$request->getArg('nodb')) {
- $upgrade->CheckDatabaseUpdate($request); // first check cached_html and friends
+ $upgrade->CheckDatabaseUpdate(); // first check cached_html and friends
}
if (!$request->getArg('nopgsrc')) {
- $upgrade->CheckPgsrcUpdate($request);
- $upgrade->CheckActionPageUpdate($request);
+ $upgrade->CheckPgsrcUpdate();
+ $upgrade->CheckActionPageUpdate();
}
if (!$request->getArg('noconfig')) {
- $upgrade->CheckConfigUpdate($request);
+ $upgrade->CheckConfigUpdate();
}
EndLoadDump($request);
}
Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/Hawaiian/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -32,7 +32,7 @@
// expected to be in the same directory that the base style is in.
$this->setDefaultCSS('Hawaiian', 'Hawaiian.css');
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/MacOSX/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -102,7 +102,7 @@
// This allows one to manually select "Printer" style (when browsing page)
// to see what the printer style looks like.
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css');
/**
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/MonoBook/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -71,7 +71,7 @@
// This allows one to manually select "Printer" style (when browsing page)
// to see what the printer style looks like.
- $this->addAlternateCSS(_("Printer"), 'commonPrint.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'commonPrint.css');
$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
Modified: trunk/themes/Portland/themeinfo.php
===================================================================
--- trunk/themes/Portland/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/Portland/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -61,7 +61,7 @@
// expected to be in the same directory that the base style is in.
$this->setDefaultCSS('Portland', 'portland.css');
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/Sidebar/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -120,7 +120,7 @@
$this->setDefaultCSS(_("Sidebar"), array('' => 'sidebar.css',
'print' => 'phpwiki-printer.css'));
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
/**
Modified: trunk/themes/SpaceWiki/themeinfo.php
===================================================================
--- trunk/themes/SpaceWiki/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/SpaceWiki/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -45,7 +45,7 @@
// expected to be in the same directory that the base style is in.
$this->setDefaultCSS('SpaceWiki', 'SpaceWiki.css');
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
Modified: trunk/themes/Wordpress/themeinfo.php
===================================================================
--- trunk/themes/Wordpress/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/Wordpress/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -63,7 +63,7 @@
// expected to be in the same directory that the base style is in.
$this->setDefaultCSS('Wordpress', 'Wordpress.css');
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
Modified: trunk/themes/shamino_com/themeinfo.php
===================================================================
--- trunk/themes/shamino_com/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/shamino_com/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -57,7 +57,7 @@
// This allows one to manually select "Printer" style (when browsing page)
// to see what the printer style looks like.
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
Modified: trunk/themes/wikilens/themeinfo.php
===================================================================
--- trunk/themes/wikilens/themeinfo.php 2015-07-10 10:55:26 UTC (rev 9709)
+++ trunk/themes/wikilens/themeinfo.php 2015-07-10 14:20:58 UTC (rev 9710)
@@ -29,7 +29,7 @@
// This allows one to manually select "Printer" style (when browsing page)
// to see what the printer style looks like.
- $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+ $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
