From 5baa87681187da76d76b09287abd97824c8cb0d0 Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 26 Apr 2013 12:48:14 +0000 Subject: [PATCH] Add return argument git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8770 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/plugin/PhotoAlbum.php | 10 ++++++---- lib/plugin/RateIt.php | 4 +++- lib/plugin/WatchPage.php | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/plugin/PhotoAlbum.php b/lib/plugin/PhotoAlbum.php index 39194d89b..d67a0993b 100644 --- a/lib/plugin/PhotoAlbum.php +++ b/lib/plugin/PhotoAlbum.php @@ -185,7 +185,9 @@ class WikiPlugin_PhotoAlbum if ($align != 'left' && $align != 'center' && $align != 'right') { $align = 'center'; } - if (count($photos) == 0) return; + if (count($photos) == 0) { + return HTML::raw(); + } if (in_array("sort", $attributes)) sort($photos); @@ -605,7 +607,7 @@ display_slides();")); "src" => $src . "/$file", "desc" => ""); } - return; + return ''; } // check if $src is an image foreach (array('jpeg', 'jpg', 'png', 'gif') as $ext) { @@ -618,7 +620,7 @@ display_slides();")); "name_tile" => $src, "src" => $src, "desc" => ""); - return; + return ''; } if (!file_exists($src)) return $this->error(fmt("Unable to find src=“%s”", $src)); @@ -627,7 +629,7 @@ display_slides();")); "name_tile" => $src, "src" => $src, "desc" => ""); - return; + return ''; } } if ($web_location == 0) { diff --git a/lib/plugin/RateIt.php b/lib/plugin/RateIt.php index 372303e41..8fdd259cb 100644 --- a/lib/plugin/RateIt.php +++ b/lib/plugin/RateIt.php @@ -294,7 +294,9 @@ var msg_rating_deleted = '" . _("Rating deleted!") . "'; function box($args = false, $request = false, $basepage = false) { if (!$request) $request =& $GLOBALS['request']; - if (!$request->_user->isSignedIn()) return; + if (!$request->_user->isSignedIn()) { + return HTML::raw(); + } if (!isset($args)) $args = array(); $args['small'] = 1; $argstr = ''; diff --git a/lib/plugin/WatchPage.php b/lib/plugin/WatchPage.php index d4ee233a1..a6402c5e0 100644 --- a/lib/plugin/WatchPage.php +++ b/lib/plugin/WatchPage.php @@ -145,12 +145,12 @@ class WikiPlugin_WatchPage array('warningmsg' => _('WatchPage cancelled')), 'absolute_url')); // noreturn - return; + return ''; } if ($request->getArg('edit')) { $request->redirect(WikiURL(_("UserPreferences"), false, 'absolute_url')); // noreturn - return; + return ''; } $add = $request->getArg('add'); if ($add and !$request->getArg('verify')) { -- 2.42.0