| Index: trunk/phase3/docs/hooks.txt |
| — | — | @@ -1354,10 +1354,14 @@ |
| 1355 | 1355 | $user: user object |
| 1356 | 1356 | $name: user name |
| 1357 | 1357 | |
| 1358 | | -'UserLoadFromSession': called to authenticate users on external/environmental means |
| | 1358 | +'UserLoadFromSession': called to authenticate users on external/environmental means; occurs before session is loaded |
| 1359 | 1359 | $user: user object being loaded |
| 1360 | 1360 | &$result: set this to a boolean value to abort the normal authentification process |
| 1361 | 1361 | |
| | 1362 | +'UserLoadFromSession': called to authenticate users on external/environmental means; occurs after session is loaded |
| | 1363 | +$user: user object being loaded |
| | 1364 | +&$result: set this to a boolean value to abort the normal authentification process |
| | 1365 | + |
| 1362 | 1366 | 'UserLoginComplete': after a user has logged in |
| 1363 | 1367 | $user: the user object that was created on login |
| 1364 | 1368 | $inject_html: Any HTML to inject after the "logged in" message. |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -247,6 +247,7 @@ |
| 248 | 248 | break; |
| 249 | 249 | case 'session': |
| 250 | 250 | $this->loadFromSession(); |
| | 251 | + wfRunHooks( 'UserLoadAfterLoadFromSession', array( $this, &$result ) ); |
| 251 | 252 | break; |
| 252 | 253 | default: |
| 253 | 254 | throw new MWException( "Unrecognised value for User->mFrom: \"{$this->mFrom}\"" ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -256,6 +256,7 @@ |
| 257 | 257 | user can only change his rights |
| 258 | 258 | * (bug 15846) Categories "leak" from older revisions in certain circumstances |
| 259 | 259 | * (bug 15928) Special pages dropdown should be inline in non-MonoBook skins |
| | 260 | +* (bug 14178) Some uses of UserLoadFromSession hook cause segfault |
| 260 | 261 | |
| 261 | 262 | === API changes in 1.14 === |
| 262 | 263 | |