From a3d4645f1ef6818923729a20de3a3a6397028694 Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 26 Apr 2013 13:06:20 +0000 Subject: [PATCH] Add missing return git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8771 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/plugin/FileInfo.php | 1 + lib/plugin/FoafViewer.php | 1 + lib/plugin/FrameInclude.php | 1 + lib/plugin/LinkDatabase.php | 1 + lib/plugin/ModeratedPage.php | 2 ++ lib/plugin/PhotoAlbum.php | 2 ++ lib/plugin/RateIt.php | 1 + lib/plugin/WatchPage.php | 1 + lib/plugin/WikiAdminSelect.php | 1 + lib/plugin/WikiAdminUtils.php | 1 + 10 files changed, 12 insertions(+) diff --git a/lib/plugin/FileInfo.php b/lib/plugin/FileInfo.php index 75482ea77..d37f3ec8f 100644 --- a/lib/plugin/FileInfo.php +++ b/lib/plugin/FileInfo.php @@ -204,6 +204,7 @@ class WikiPlugin_FileInfo $n -= floor($factor * $b); return number_format($b, $n ? 3 : 0) . $suffix; } + return ''; } function phonysize($a) diff --git a/lib/plugin/FoafViewer.php b/lib/plugin/FoafViewer.php index bff5d75e5..72684a399 100644 --- a/lib/plugin/FoafViewer.php +++ b/lib/plugin/FoafViewer.php @@ -187,6 +187,7 @@ class WikiPlugin_FoafViewer return $html; } } + return ''; } /** diff --git a/lib/plugin/FrameInclude.php b/lib/plugin/FrameInclude.php index e8cf221d3..3d7469df1 100644 --- a/lib/plugin/FrameInclude.php +++ b/lib/plugin/FrameInclude.php @@ -145,6 +145,7 @@ class WikiPlugin_FrameInclude $request->discardOutput(); displayPage($request, new Template('frameset', $request, $tokens)); $request->finish(); //noreturn + return ''; } } diff --git a/lib/plugin/LinkDatabase.php b/lib/plugin/LinkDatabase.php index 01d5d3fe3..2dacd1185 100644 --- a/lib/plugin/LinkDatabase.php +++ b/lib/plugin/LinkDatabase.php @@ -183,6 +183,7 @@ class WikiPlugin_LinkDatabase } else { return $this->error(fmt("Unsupported format argument %s", $args['format'])); } + return ''; } } diff --git a/lib/plugin/ModeratedPage.php b/lib/plugin/ModeratedPage.php index 4fab64e8a..a78cec0ca 100644 --- a/lib/plugin/ModeratedPage.php +++ b/lib/plugin/ModeratedPage.php @@ -323,6 +323,7 @@ class WikiPlugin_ModeratedPage } else { return $this->approval_form($request, $args, $moderation, 'approve'); } + return ''; } /** @@ -337,6 +338,7 @@ class WikiPlugin_ModeratedPage } else { return $this->approval_form($request, $args, $moderation, 'reject'); } + return ''; } function cleanup_and_notify(&$request, $args, &$moderation) diff --git a/lib/plugin/PhotoAlbum.php b/lib/plugin/PhotoAlbum.php index d67a0993b..c12314799 100644 --- a/lib/plugin/PhotoAlbum.php +++ b/lib/plugin/PhotoAlbum.php @@ -549,6 +549,7 @@ display_slides();")); } $photos[] = array("name" => $src, //album_location."/$src".album_default_extension, "desc" => ""); + return ''; } /** @@ -668,6 +669,7 @@ display_slides();")); "name_tile" => dirname($src) . "/" . trim($data[0])); } } + return ''; } } diff --git a/lib/plugin/RateIt.php b/lib/plugin/RateIt.php index 8fdd259cb..7d22a160c 100644 --- a/lib/plugin/RateIt.php +++ b/lib/plugin/RateIt.php @@ -288,6 +288,7 @@ var msg_rating_deleted = '" . _("Rating deleted!") . "'; } return $html; } + return HTML::raw(); } // box is used to display a fixed-width, narrow version with common header diff --git a/lib/plugin/WatchPage.php b/lib/plugin/WatchPage.php index a6402c5e0..f5947c848 100644 --- a/lib/plugin/WatchPage.php +++ b/lib/plugin/WatchPage.php @@ -169,6 +169,7 @@ class WikiPlugin_WatchPage } } } + return ''; } } diff --git a/lib/plugin/WikiAdminSelect.php b/lib/plugin/WikiAdminSelect.php index d1f582fce..8c7b848fe 100644 --- a/lib/plugin/WikiAdminSelect.php +++ b/lib/plugin/WikiAdminSelect.php @@ -232,6 +232,7 @@ class WikiPlugin_WikiAdminSelect } else { ; //return $action_result; } + return ''; } protected function tablePush(&$table, $first, $second) diff --git a/lib/plugin/WikiAdminUtils.php b/lib/plugin/WikiAdminUtils.php index 1349f74ef..715086fa6 100644 --- a/lib/plugin/WikiAdminUtils.php +++ b/lib/plugin/WikiAdminUtils.php @@ -108,6 +108,7 @@ class WikiPlugin_WikiAdminUtils $message, array(_("Back") => $args['return_url'])); $alert->show(); // noreturn + return ''; } private function _getLabel($action) -- 2.42.0