| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -542,7 +542,9 @@ |
| 543 | 543 | $res = wfQuery("SELECT old_text FROM old WHERE old_namespace = $ns AND ". |
| 544 | 544 | "old_title = '{$title}' AND old_timestamp = '{$oldDate}'", DB_WRITE); |
| 545 | 545 | $obj = wfFetchObject($res); |
| 546 | | - if(wfMerge($obj->old_text, $text, $yourtext, $result)){ |
| | 546 | + $oldText = Article::getRevisionText( $obj ); |
| | 547 | + |
| | 548 | + if(wfMerge($oldText, $text, $yourtext, $result)){ |
| 547 | 549 | $text = $result; |
| 548 | 550 | return true; |
| 549 | 551 | } else { |