svn: /web/php/trunk/include/ prepend.inc
| From: | Philip Olson | Date: | Sat, 02 Jul 2011 01:02:49 +0000 |
| Subject: | svn: /web/php/trunk/include/ prepend.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-11431@lists.php.net to get a copy of this message | ||
philip Sat, 02 Jul 2011 01:02:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312790
Log:
re-enable prototype. to always show beta mode (sorry about that), and make docs. default to beta
mode but respect the my.php cookie.
Changed paths:
U web/php/trunk/include/prepend.inc
Modified: web/php/trunk/include/prepend.inc
===================================================================
--- web/php/trunk/include/prepend.inc 2011-07-01 23:13:53 UTC (rev 312789)
+++ web/php/trunk/include/prepend.inc 2011-07-02 01:02:49 UTC (rev 312790)
@@ -66,11 +66,15 @@
// Load in the user preferences
function myphpnet_load()
{
- global $MYPHPNET;
+ global $MYPHPNET, $MYSITE;
// Empty the preferences array
$MYPHPNET = array(FALSE, FALSE, "NONE", 0, FALSE);
+ if ($MYSITE === 'http://docs.php.net/') {
+ $MYPHPNET[4] = TRUE;
+ }
+
// If we have a cookie, set the values in the array
if (!empty($_COOKIE['MYPHPNET'])) {
$MYPHPNET = explode(",", $_COOKIE['MYPHPNET']);
@@ -177,14 +181,14 @@
return (bool)$_GET["beta"];
}
+ if ($MYSITE === 'http://prototype.php.net/') {
+ return true;
+ }
+
if (isset($MYPHPNET[4])) {
return (bool)$MYPHPNET[4];
}
- if ($MYSITE == "http://prototype.php.net/" || $MYSITE == "http://docs.php.net/") {
- return true;
- }
-
return false;
}