phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[7254] trunk/lib/plugin/SearchHighlight.php

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

Revision: 7254
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7254&view=rev
Author:   vargenau
Date:     2009-11-01 19:40:59 +0000 (Sun, 01 Nov 2009)

Log Message:
-----------
Normalize header

Modified Paths:
--------------
    trunk/lib/plugin/SearchHighlight.php

Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php	2009-11-01 19:34:26 UTC (rev 7253)
+++ trunk/lib/plugin/SearchHighlight.php	2009-11-01 19:40:59 UTC (rev 7254)
@@ -1,25 +1,25 @@
 <?php // -*-php-*-
 rcs_id('$Id$');
 /*
-Copyright 2004,2007 $ThePhpWikiProgrammingTeam
+ * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
+ * 
+ * This file is NOT part of PhpWiki.
+ * 
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
-This file is NOT part of PhpWiki.
-
-PhpWiki is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-PhpWiki is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with PhpWiki; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
 require_once("lib/TextSearchQuery.php");
 require_once("lib/PageList.php");
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8579] trunk/lib/plugin/SearchHighlight.php

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

Revision: 8579
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8579&view=rev
Author:   vargenau
Date:     2012-11-30 15:31:50 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
Avoid warning

Modified Paths:
--------------
    trunk/lib/plugin/SearchHighlight.php

Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php	2012-11-30 15:16:08 UTC (rev 8578)
+++ trunk/lib/plugin/SearchHighlight.php	2012-11-30 15:31:50 UTC (rev 8579)
@@ -62,8 +62,9 @@
         if (empty($args['s']) and isset($request->_searchhighlight)) {
             $args['s'] = $request->_searchhighlight['query'];
         }
-        if (empty($args['s']))
-            return '';
+        if (empty($args['s'])) {
+            return HTML();
+        }
         extract($args);
         $html = HTML();
         if (!$noheader and isset($request->_searchhighlight)) {

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