| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1470,6 +1470,9 @@ |
| 1471 | 1471 | * view for watched pages with new changes */ |
| 1472 | 1472 | $wgShowUpdatedMarker = true; |
| 1473 | 1473 | |
| | 1474 | +/** |
| | 1475 | + * Default cookie expiration time. Setting to 0 disables makes all cookies session-only. |
| | 1476 | + */ |
| 1474 | 1477 | $wgCookieExpiration = 30*86400; |
| 1475 | 1478 | |
| 1476 | 1479 | /** Clock skew or the one-second resolution of time() can occasionally cause cache |
| — | — | @@ -1557,11 +1560,6 @@ |
| 1558 | 1561 | $wgCookieHttpOnly = version_compare("5.2", PHP_VERSION, "<"); |
| 1559 | 1562 | |
| 1560 | 1563 | /** |
| 1561 | | - * Allow MediaWiki to set persistent cookies for login, etc. |
| 1562 | | - */ |
| 1563 | | -$wgEnablePersistentCookies = true; |
| 1564 | | - |
| 1565 | | -/** |
| 1566 | 1564 | * If the requesting browser matches a regex in this blacklist, we won't |
| 1567 | 1565 | * send it cookies with HttpOnly mode, even if $wgCookieHttpOnly is on. |
| 1568 | 1566 | */ |
| Index: trunk/phase3/includes/WebResponse.php |
| — | — | @@ -12,13 +12,9 @@ |
| 13 | 13 | |
| 14 | 14 | /** Set the browser cookie */ |
| 15 | 15 | function setcookie( $name, $value, $expire = 0 ) { |
| 16 | | - global $wgEnablePersistentCookies; |
| 17 | | - if ( !$wgEnablePersistentCookies ) { |
| 18 | | - return false; |
| 19 | | - } |
| 20 | 16 | global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain; |
| 21 | 17 | global $wgCookieSecure,$wgCookieExpiration, $wgCookieHttpOnly; |
| 22 | | - if( $expire == 0 ) { |
| | 18 | + if ( $expire == 0 ) { |
| 23 | 19 | $expire = time() + $wgCookieExpiration; |
| 24 | 20 | } |
| 25 | 21 | $httpOnlySafe = wfHttpOnlySafe(); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -34,8 +34,6 @@ |
| 35 | 35 | $wgAddGroups and $wgRemoveGroups, where the user must belong to a specified |
| 36 | 36 | group in order to add or remove those groups from themselves. |
| 37 | 37 | Backwards compatibility is maintained. |
| 38 | | -* $wgEnablePersistentCookies has been added. Setting to false disables the |
| 39 | | - setting of persistent cookies. Defaults to true. |
| 40 | 38 | * $wgRestrictDisplayTitle controls if the use of the {{DISPLAYTITLE}} magic |
| 41 | 39 | word is restricted to titles equivalent to the actual page title. This |
| 42 | 40 | is true per default, but can be set to false to allow any title. |