cvs: phpweb /include layout.inc
| From: | Sara Golemon | Date: | Wed, 13 Sep 2006 23:38:23 +0000 |
| Subject: | cvs: phpweb /include layout.inc | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-32598@lists.php.net to get a copy of this message | ||
pollita Wed Sep 13 23:38:23 2006 UTC
Modified files:
/phpweb/include layout.inc
Log:
Bug#38817
http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.241&r2=1.242&diff_format=u
Index: phpweb/include/layout.inc
diff -u phpweb/include/layout.inc:1.241 phpweb/include/layout.inc:1.242
--- phpweb/include/layout.inc:1.241 Wed Sep 13 22:08:38 2006
+++ phpweb/include/layout.inc Wed Sep 13 23:38:23 2006
@@ -1,5 +1,5 @@
<?php
-/* $Id: layout.inc,v 1.241 2006/09/13 22:08:38 goba Exp $ */
+/* $Id: layout.inc,v 1.242 2006/09/13 23:38:23 pollita Exp $ */
// Set the static content root differently on php.net
$_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ?
@@ -107,7 +107,11 @@
// Support for more header tags
$moreheadtags = '';
if (isset($config['headtags'])) {
- $moreheadtags = "\n " . join("\n ", $config['headtags']);
+ if (is_array($config['headtags'])) {
+ $moreheadtags = "\n " . join("\n ", $config['headtags']);
+ } else {
+ $moreheadtags = "\n " . ((string)$config['headtags']);
+ }
}
print <<<END_HEADER