| Index: branches/wmf-deployment/extensions/CentralAuth/CentralAuthHooks.php |
| — | — | @@ -187,12 +187,12 @@ |
| 188 | 188 | // Sanity check to avoid session ID collisions, as reported on bug 19158 |
| 189 | 189 | if ( !isset($_COOKIE["{$prefix}User"]) ) { |
| 190 | 190 | wfDebug( __METHOD__.": no User cookie, so unable to check for session mismatch\n" ); |
| 191 | | - return; |
| | 191 | + return true; |
| 192 | 192 | } elseif ( $_COOKIE["{$prefix}User"] != $userName ) { |
| 193 | 193 | wfDebug( __METHOD__.": Session ID/User mismatch. Possible session collision. ". |
| 194 | 194 | "Expected: $userName; actual: ". |
| 195 | 195 | $_COOKIE["{$prefix}User"]."\n" ); |
| 196 | | - return; |
| | 196 | + return true; |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | // Clean up username |
| Property changes on: branches/wmf-deployment/extensions/CentralAuth/CentralAuthHooks.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 200 | 200 | + /branches/REL1_15/phase3/extensions/CentralAuth/CentralAuthHooks.php:51646 |
| /trunk/extensions/CentralAuth/CentralAuthHooks.php:56207,56209,56296,56333,56355,56508 |
| /trunk/phase3/extensions/CentralAuth/CentralAuthHooks.php:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |