Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1253) +++ branches/2.8.x/CHANGELOG (revision 1254) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- +21-Jan-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #915 fix bug in search (utf-8 characters corrupted)(thanks to Thorn) 19-Jan-2010 Dietmar Woellbrink (Luisehahne) # fix some more small css-errors in WB Backend (thanks to Ruebenwurzel) 19-Jan-2010 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1253) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1254) @@ -1,68 +1,51 @@ -* Copyright (C) 2009, Website Baker Org. e.V. -* http://start.websitebaker2.org/impressum-datenschutz.php -* Copyright (C) 2004-2009, Ryan Djurovich -* -* About WebsiteBaker -* -* Website Baker is a PHP-based Content Management System (CMS) -* designed with one goal in mind: to enable its users to produce websites -* with ease. -* -***************************************************************************** -* -***************************************************************************** -* LICENSE INFORMATION -* -* WebsiteBaker 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. -* -* WebsiteBaker 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 this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -**************************************************************************** -* -* WebsiteBaker Extra Information -* -* Version file -* -* This file is where the WB release version is stored. -* -* -* -*****************************************************************************/ -/** +/* + * About WebsiteBaker * - * @category admin - * @package version - * @author Ryan Djurovich - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2010, Website Baker Org. e.V. - * @version $Id$ - * @revision $Revision$ - * @platform WebsiteBaker 2.8.x - * @requirements >= PHP 4.3.4 - * @license http://www.gnu.org/licenses/gpl.html + * Website Baker is a PHP-based Content Management System (CMS) + * designed with one goal in mind: to enable its users to produce websites + * with ease. * + * LICENSE INFORMATION + * + * WebsiteBaker 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. + * + * WebsiteBaker 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * WebsiteBaker Extra Information + * + * This file is where the WB release version is stored. + * */ + /** + * @category admin + * @package interface + * @filesource $HeadURL$ + * @author Ryan Djurovich + * @copyright 2004-2009, Ryan Djurovich + * + * @author WebsiteBaker Project + * @link http://www.websitebaker2.org/ + * @copyright 2009-2010, Website Baker Org. e.V. + * @link http://start.websitebaker2.org/impressum-datenschutz.php + * @license http://www.gnu.org/licenses/gpl.html + * @version $Id$ + * @revision $Revision$ + * @platform WebsiteBaker 2.8.x + * @requirements PHP 4.3.4 and higher + * @lastmodified $Date: $ + * + */ if(!defined('WB_URL')) { header('Location: ../index.php'); @@ -71,6 +54,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.1'); -if(!defined('REVISION')) define('REVISION', '1253'); +if(!defined('REVISION')) define('REVISION', '1254'); ?> \ No newline at end of file Property changes on: branches/2.8.x/wb/admin/interface/version.php ___________________________________________________________________ Modified: svn:keywords ## -1,2 +1,3 ## Id -Revision \ No newline at end of property +Revision +HeadURL \ No newline at end of property Index: branches/2.8.x/wb/search/search.php =================================================================== --- branches/2.8.x/wb/search/search.php (revision 1253) +++ branches/2.8.x/wb/search/search.php (revision 1254) @@ -1,30 +1,14 @@ -* Copyright (C) 2009, Website Baker Org. e.V. -* http://start.websitebaker2.org/impressum-datenschutz.php -* Copyright (C) 2004-2009, Ryan Djurovich -* -* About WebsiteBaker -* * Website Baker is a PHP-based Content Management System (CMS) * designed with one goal in mind: to enable its users to produce websites * with ease. * -***************************************************************************** +* LICENSE INFORMATION * -***************************************************************************** -* LICENSE INFORMATION -* * WebsiteBaker 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 @@ -38,29 +22,29 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -**************************************************************************** * * WebsiteBaker Extra Information * * -* -* -* -* -* -*****************************************************************************/ +*/ /** * - * @category frontend - * @package account - * @author Ryan Djurovich - * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2010, Website Baker Org. e.V. - * @version $Id$ - * @platform WebsiteBaker 2.8.x - * @requirements >= PHP 4.3.4 - * @license http://www.gnu.org/licenses/gpl.html + * @category frontend + * @package search + * @filesource $HeadURL$ + * @author Ryan Djurovich + * @copyright 2004-2009, Ryan Djurovich * + * @author WebsiteBaker Project + * @link http://www.websitebaker2.org/ + * @copyright 2009-2010, Website Baker Org. e.V. + * @link http://start.websitebaker2.org/impressum-datenschutz.php + * @license http://www.gnu.org/licenses/gpl.html + * @version $Id$ + * @platform WebsiteBaker 2.8.x + * @requirements PHP 4.3.4 and higher + * @lastmodified $Date: $ + * */ if(!defined('WB_URL')) { @@ -235,16 +219,18 @@ $search_display_string = ''; // for displaying $search_url_string = ''; // for $_GET -- ATTN: unquoted! Will become urldecoded later $string = ''; -if(isset($_REQUEST['string'])) { - if($match!='exact') { // $string will be cleaned below +if(isset($_REQUEST['string'])) +{ + if($match!='exact') // $string will be cleaned below + { $string=str_replace(',', '', $_REQUEST['string']); } else { $string=$_REQUEST['string']; } - // redo possible magic quotes - $string = $wb->strip_slashes($string); - $string = preg_replace('/\s+/', ' ', $string); - $string = trim($string); + // redo possible magic quotes + $string = $wb->strip_slashes($string); + $string = preg_replace('/[ \r\n\t]+/', ' ', $string); + $string = trim($string); // remove some bad chars $string = str_replace ( array('[[',']]'),'', $string); $string = preg_replace('/(^|\s+)[|.]+(?=\s+|$)/', '', $string);