RE: phpweb /include layout.inc
| From: | Andi Gutmans | Date: | Thu, 14 Sep 2006 00:30:53 +0000 |
| Subject: | RE: phpweb /include layout.inc | ||
| References: | 1 | Groups: | php.mirrors |
| Request: | Send a blank email to php-mirrors+get-32604@lists.php.net to get a copy of this message | ||
Did you break the Web site?
It has the following now:
Warning: join() [function.join]: Bad arguments. in
/home/local/Web/sites/www.php.net/include/layout.inc on line 110
> -----Original Message-----
> From: Sara Golemon [mailto:pollita@php.net]
> Sent: Wednesday, September 13, 2006 4:38 PM
> To: php-mirrors@lists.php.net
> Subject: cvs: phpweb /include layout.inc
>
> 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.2
> 41&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
>