Re: svn: /web/php/trunk/include/ prepend.inc

On Wed, Jun 29, 2011 at 10:14, Philip Olson <philip@roshambo.org> wrote: > > On Jun 29, 2011, at 12:46 AM, Hannes Magnusson wrote: > >> On Wed, Jun 29, 2011 at 03:26, Philip Olson <philip@php.net> wrote: >>> philip                                   Wed, 29 Jun 2011 01:26:25 >>> +0000 >>> >>> Revision: >>> http://svn.php.net/viewvc?view=revision&revision=312613 >>> >>> Log: >>> Allow my.php cookie to also affect docs/prototype, but leave default for them as true. >>> >>> Changed paths: >>>    U   web/php/trunk/include/prepend.inc >>> >>> Modified: web/php/trunk/include/prepend.inc >>> =================================================================== >>> --- web/php/trunk/include/prepend.inc   2011-06-29 00:04:43 UTC (rev 312612) >>> +++ web/php/trunk/include/prepend.inc   2011-06-29 01:26:25 UTC (rev 312613) >>> @@ -177,11 +177,11 @@ >>>         return (bool)$_GET["beta"]; >>>     } >>> >>> -    if ($MYSITE == >>> "http://prototype.php.net/" || $MYSITE == >>> "http://docs.php.net/") { >>> -        return true; >>> +    if (isset($MYPHPNET[4])) { >>> +        return (bool)$MYPHPNET[4]; >>>     } >>> >>> -    if (isset($MYPHPNET[4]) && $MYPHPNET[4]) { >>> +    if ($MYSITE == >>> "http://prototype.php.net/" || $MYSITE == >>> "http://docs.php.net/") { >>>         return true; >> >> >> The point with the previous logic was to force prototype and docs to >> be in beta mode.. >> Now you explicitly need to enable it - even on the two dedicated testing hosts? > > The intent was that you must explicitly disable it for those testing hosts (namely, docs), > which should be possible. I can look at this tomorrow [and fix] but do think disabling beta mode via > my.php should be possible for docs.php.net, whereas prototype.php.net should probably revert to the > previous behavior. > Fair enough. -Hannes