| Index: branches/wmf/1.18wmf1/extensions/CodeReview/backend/CodeRevision.php |
| — | — | @@ -700,7 +700,6 @@ |
| 701 | 701 | 'cc_user' => $wgUser->getId(), |
| 702 | 702 | 'cc_user_text' => $wgUser->getName(), |
| 703 | 703 | 'cc_timestamp' => $dbw->timestamp( $ts ), |
| 704 | | - 'cc_review' => $review, |
| 705 | 704 | 'cc_sortkey' => $sortkey ); |
| 706 | 705 | } |
| 707 | 706 | |
| — | — | @@ -742,7 +741,6 @@ |
| 743 | 742 | 'cc_user', |
| 744 | 743 | 'cc_user_text', |
| 745 | 744 | 'cc_timestamp', |
| 746 | | - 'cc_review', |
| 747 | 745 | 'cc_sortkey' ), |
| 748 | 746 | array( |
| 749 | 747 | 'cc_repo_id' => $this->repoId, |
| Property changes on: branches/wmf/1.18wmf1/extensions/CodeReview/backend/CodeRevision.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 750 | 748 | Merged /trunk/extensions/CodeReview/backend/CodeRevision.php:r101084 |
| Index: branches/wmf/1.18wmf1/extensions/CodeReview/backend/CodeComment.php |
| — | — | @@ -1,7 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | class CodeComment { |
| 5 | | - public $id, $text, $user, $userText, $timestamp, $review, $sortkey, $attrib, $removed, $added; |
| | 5 | + public $id, $text, $user, $userText, $timestamp, $sortkey, $attrib, $removed, $added; |
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * @var CodeRevision |
| — | — | @@ -36,7 +36,6 @@ |
| 37 | 37 | $comment->user = $data['cc_user']; |
| 38 | 38 | $comment->userText = $data['cc_user_text']; |
| 39 | 39 | $comment->timestamp = wfTimestamp( TS_MW, $data['cc_timestamp'] ); |
| 40 | | - $comment->review = $data['cc_review']; |
| 41 | 40 | $comment->sortkey = $data['cc_sortkey']; |
| 42 | 41 | return $comment; |
| 43 | 42 | } |
| Property changes on: branches/wmf/1.18wmf1/extensions/CodeReview |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 44 | 43 | Merged /trunk/extensions/CodeReview:r101084 |