bug 401 fixed: CSS identifier "theHeader" should not be part of the

parameter value.


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1345 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 54 insertions, 3 deletions

diff --git a/install/config.sql b/install/config.sql
index 6bd677fa6..b69a5ca5b 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -18,7 +18,7 @@ INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('gallery_title','
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('gallery_url','http://demo.phpwebgallery.net','URL given in RSS feed');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('rate','true','Rating pictures feature is enabled');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('rate_anonymous','true','Rating pictures feature is also enabled for visitors');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('page_banner','<div id=\"theHeader\"><h1>PhpWebGallery demonstration site</h1><p>My photos web site</p></div>','html displayed on the top each page of your gallery');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('page_banner','<h1>PhpWebGallery demonstration site</h1><p>My photos web site</p>','html displayed on the top each page of your gallery');
 
 -- Notification by mail
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail');
diff --git a/install/db/22.3-database.php b/install/db/22.3-database.php
new file mode 100644
index 000000000..89f192383
--- /dev/null
+++ b/install/db/22.3-database.php
@@ -0,0 +1,51 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2005-09-21 00:04:57 +0200 (mer, 21 sep 2005) $
+// | last modifier : $Author: plg $
+// | revision      : $Revision: 870 $
+// +-----------------------------------------------------------------------+
+// | This program 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                                          |
+// |                                                                       |
+// | This program 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'reinitialize page_banner';
+
+$query = '
+UPDATE '.PREFIX_TABLE.'config
+  SET value = \'<h1>PhpWebGallery demonstration site</h1><p>My photos web site</p>\'
+  WHERE param = \'page_banner\'
+;';
+pwg_query($query);
+
+// +-----------------------------------------------------------------------+
+// |                           End notification                            |
+// +-----------------------------------------------------------------------+
+
+echo
+"\n"
+.$upgrade_description
+."\n"
+;
+?>
diff --git a/install/upgrade_1.5.0.php b/install/upgrade_1.5.0.php
index 036472449..5ab450dad 100644
--- a/install/upgrade_1.5.0.php
+++ b/install/upgrade_1.5.0.php
@@ -394,7 +394,7 @@ SELECT value
 ;';
 list($d) = array_from_query($query, 'value');
 
-$page_banner='<div id="theHeader"><h1>'.$t.'</h1><p>'.$d.'</p></div>';
+$page_banner='<h1>'.$t.'</h1><p>'.$d.'</p>';
 $page_banner=addslashes($page_banner);
 $query = '
 INSERT INTO '.PREFIX_TABLE.'config
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index d432d7b63..280d011a2 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -30,4 +30,4 @@ the "text/nonsense" prevents gecko based browsers to load it -->
 <body id="{BODY_ID}">
 <div id="the_page">
 
-{PAGE_BANNER}
+<div id="theHeader">{PAGE_BANNER}</div>