[phpwiki-checkins] SF.net SVN: phpwiki:[8770] trunk/lib/plugin

[<var...@us...>]

Revision: 8770
          http://sourceforge.net/p/phpwiki/code/8770
Author:   vargenau
Date:     2013-04-26 12:48:14 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Add return argument

Modified Paths:
--------------
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/WatchPage.php

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/PhotoAlbum.php	2013-04-26 12:48:14 UTC (rev 8770)
@@ -185,7 +185,9 @@
         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 @@
                     "src" => $src . "/$file",
                     "desc" => "");
             }
-            return;
+            return '';
         }
         // check if $src is an image
         foreach (array('jpeg', 'jpg', 'png', 'gif') as $ext) {
@@ -618,7 +620,7 @@
                         "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 @@
                     "name_tile" => $src,
                     "src" => $src,
                     "desc" => "");
-                return;
+                return '';
             }
         }
         if ($web_location == 0) {

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/RateIt.php	2013-04-26 12:48:14 UTC (rev 8770)
@@ -294,7 +294,9 @@
     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 = '';

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2013-04-18 09:36:18 UTC (rev 8769)
+++ trunk/lib/plugin/WatchPage.php	2013-04-26 12:48:14 UTC (rev 8770)
@@ -145,12 +145,12 @@
                         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')) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.