| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -1817,26 +1817,13 @@ |
| 1818 | 1818 | // Relative expiry |
| 1819 | 1819 | $exp += time(); |
| 1820 | 1820 | } |
| 1821 | | - $httpOnlySafe = version_compare( "5.2", PHP_VERSION, "<" ); |
| 1822 | | - |
| 1823 | | - if ( $httpOnlySafe && isset( $wgCookieHttpOnly ) ) { |
| 1824 | | - setcookie( $wgCentralAuthCookiePrefix . $name, |
| 1825 | | - $value, |
| 1826 | | - $exp, |
| 1827 | | - '/', |
| 1828 | | - $wgCentralAuthCookieDomain, |
| 1829 | | - $wgCookieSecure, |
| 1830 | | - $wgCookieHttpOnly ); |
| 1831 | | - } else { |
| 1832 | | - // setcookie() fails on PHP 5.1 if you give it future-compat paramters. |
| 1833 | | - // stab stab! |
| 1834 | | - setcookie( $wgCentralAuthCookiePrefix . $name, |
| 1835 | | - $value, |
| 1836 | | - $exp, |
| 1837 | | - '/', |
| 1838 | | - $wgCentralAuthCookieDomain, |
| 1839 | | - $wgCookieSecure ); |
| 1840 | | - } |
| | 1821 | + setcookie( $wgCentralAuthCookiePrefix . $name, |
| | 1822 | + $value, |
| | 1823 | + $exp, |
| | 1824 | + '/', |
| | 1825 | + $wgCentralAuthCookieDomain, |
| | 1826 | + $wgCookieSecure, |
| | 1827 | + $wgCookieHttpOnly ); |
| 1841 | 1828 | } |
| 1842 | 1829 | |
| 1843 | 1830 | /** |