dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
717af5a
)
remove conflict markers
author
Andrew Garrett
<werdna@users.mediawiki.org>
Tue, 7 Jul 2009 14:32:52 +0000
(14:32 +0000)
committer
Andrew Garrett
<werdna@users.mediawiki.org>
Tue, 7 Jul 2009 14:32:52 +0000
(14:32 +0000)
docs/hooks.txt
patch
|
blob
|
history
diff --git
a/docs/hooks.txt
b/docs/hooks.txt
index
974c499
..
e2a745d
100644
(file)
--- a/
docs/hooks.txt
+++ b/
docs/hooks.txt
@@
-1534,11
+1534,7
@@
$template: SimpleTemplate instance for the form
'UserLoginMailPassword': Block users from emailing passwords
$name: the username to email the password of.
-<<<<<<< .mine
-&$error: out-param – the error message to return.
-=======
&$error: out-param - the error message to return.
->>>>>>> .r52831
'UserLogout': before a user logs out
$user: the user object that is about to be logged out