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:
cdf6812
)
Fixed bug in edit conflict merge feature -- didn't decompress old_text
author
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 29 May 2004 16:20:08 +0000
(16:20 +0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 29 May 2004 16:20:08 +0000
(16:20 +0000)
includes/EditPage.php
patch
|
blob
|
history
diff --git
a/includes/EditPage.php
b/includes/EditPage.php
index
61729bd
..
4ebf6e7
100644
(file)
--- a/
includes/EditPage.php
+++ b/
includes/EditPage.php
@@
-542,7
+542,9
@@
htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
$res = wfQuery("SELECT old_text FROM old WHERE old_namespace = $ns AND ".
"old_title = '{$title}' AND old_timestamp = '{$oldDate}'", DB_WRITE);
$obj = wfFetchObject($res);
- if(wfMerge($obj->old_text, $text, $yourtext, $result)){
+ $oldText = Article::getRevisionText( $obj );
+
+ if(wfMerge($oldText, $text, $yourtext, $result)){
$text = $result;
return true;
} else {