| Index: trunk/extensions/CodeReview/CodeRevision.php |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | class CodeRevision { |
| 6 | 6 | static function newFromSvn( CodeRepository $repo, $data ) { |
| 7 | 7 | $rev = new CodeRevision(); |
| 8 | | - $rev->mRepo = $repo->getId(); |
| | 8 | + $rev->mRepoId = $repo->getId(); |
| 9 | 9 | $rev->mId = intval($data['rev']); |
| 10 | 10 | $rev->mAuthor = $data['author']; |
| 11 | 11 | $rev->mTimestamp = wfTimestamp( TS_MW, strtotime( $data['date'] ) ); |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | |
| 47 | 47 | static function newFromRow( $row ) { |
| 48 | 48 | $rev = new CodeRevision(); |
| 49 | | - $rev->mRepo = intval($row->cr_repo_id); |
| | 49 | + $rev->mRepoId = intval($row->cr_repo_id); |
| 50 | 50 | $rev->mId = intval($row->cr_id); |
| 51 | 51 | $rev->mAuthor = $row->cr_author; |
| 52 | 52 | $rev->mTimestamp = wfTimestamp( TS_MW, $row->cr_timestamp ); |
| — | — | @@ -98,7 +98,7 @@ |
| 99 | 99 | $dbw->update( 'code_rev', |
| 100 | 100 | array( 'cr_status' => $status ), |
| 101 | 101 | array( |
| 102 | | - 'cr_repo_id' => $this->mRepo, |
| | 102 | + 'cr_repo_id' => $this->mRepoId, |
| 103 | 103 | 'cr_id' => $this->mId ), |
| 104 | 104 | __METHOD__ ); |
| 105 | 105 | } |
| — | — | @@ -109,7 +109,7 @@ |
| 110 | 110 | |
| 111 | 111 | $dbw->insert( 'code_rev', |
| 112 | 112 | array( |
| 113 | | - 'cr_repo_id' => $this->mRepo, |
| | 113 | + 'cr_repo_id' => $this->mRepoId, |
| 114 | 114 | 'cr_id' => $this->mId, |
| 115 | 115 | 'cr_author' => $this->mAuthor, |
| 116 | 116 | 'cr_timestamp' => $dbw->timestamp( $this->mTimestamp ), |
| — | — | @@ -127,7 +127,7 @@ |
| 128 | 128 | 'cr_message' => $this->mMessage, |
| 129 | 129 | 'cr_path' => $this->mCommonPath ), |
| 130 | 130 | array( |
| 131 | | - 'cr_repo_id' => $this->mRepo, |
| | 131 | + 'cr_repo_id' => $this->mRepoId, |
| 132 | 132 | 'cr_id' => $this->mId ), |
| 133 | 133 | __METHOD__ ); |
| 134 | 134 | } |
| — | — | @@ -136,7 +136,7 @@ |
| 137 | 137 | $data = array(); |
| 138 | 138 | foreach( $this->mPaths as $path ) { |
| 139 | 139 | $data[] = array( |
| 140 | | - 'cp_repo_id' => $this->mRepo, |
| | 140 | + 'cp_repo_id' => $this->mRepoId, |
| 141 | 141 | 'cp_rev_id' => $this->mId, |
| 142 | 142 | 'cp_path' => $path['path'], |
| 143 | 143 | 'cp_action' => $path['action'] ); |
| — | — | @@ -155,7 +155,7 @@ |
| 156 | 156 | return $dbr->select( |
| 157 | 157 | 'code_paths', |
| 158 | 158 | array( 'cp_path', 'cp_action' ), |
| 159 | | - array( 'cp_repo_id' => $this->mRepo, 'cp_rev_id' => $this->mId ), |
| | 159 | + array( 'cp_repo_id' => $this->mRepoId, 'cp_rev_id' => $this->mId ), |
| 160 | 160 | __METHOD__ |
| 161 | 161 | ); |
| 162 | 162 | } |
| — | — | @@ -194,7 +194,7 @@ |
| 195 | 195 | $ts = wfTimestamp( TS_MW ); |
| 196 | 196 | $sortkey = $this->threadedSortkey( $parent, $ts ); |
| 197 | 197 | return array( |
| 198 | | - 'cc_repo_id' => $this->mRepo, |
| | 198 | + 'cc_repo_id' => $this->mRepoId, |
| 199 | 199 | 'cc_rev_id' => $this->mId, |
| 200 | 200 | 'cc_text' => $text, |
| 201 | 201 | 'cc_parent' => $parent, |
| — | — | @@ -238,7 +238,7 @@ |
| 239 | 239 | 'cc_review', |
| 240 | 240 | 'cc_sortkey' ), |
| 241 | 241 | array( |
| 242 | | - 'cc_repo_id' => $this->mRepo, |
| | 242 | + 'cc_repo_id' => $this->mRepoId, |
| 243 | 243 | 'cc_rev_id' => $this->mId ), |
| 244 | 244 | __METHOD__, |
| 245 | 245 | array( |
| — | — | @@ -257,7 +257,7 @@ |
| 258 | 258 | $result = $dbr->select( 'code_tags', |
| 259 | 259 | array( 'ct_tag' ), |
| 260 | 260 | array( |
| 261 | | - 'ct_repo_id' => $this->mRepo, |
| | 261 | + 'ct_repo_id' => $this->mRepoId, |
| 262 | 262 | 'ct_rev_id' => $this->mId ), |
| 263 | 263 | __METHOD__ ); |
| 264 | 264 | |
| — | — | @@ -284,7 +284,7 @@ |
| 285 | 285 | } |
| 286 | 286 | $result = $dbw->delete( 'code_tags', |
| 287 | 287 | array( |
| 288 | | - 'ct_repo_id' => $this->mRepo, |
| | 288 | + 'ct_repo_id' => $this->mRepoId, |
| 289 | 289 | 'ct_rev_id' => $this->mId, |
| 290 | 290 | 'ct_tag' => $tagsNormal ), |
| 291 | 291 | __METHOD__ ); |
| — | — | @@ -294,7 +294,7 @@ |
| 295 | 295 | $data = array(); |
| 296 | 296 | foreach( $tags as $tag ) { |
| 297 | 297 | $data[] = array( |
| 298 | | - 'ct_repo_id' => $this->mRepo, |
| | 298 | + 'ct_repo_id' => $this->mRepoId, |
| 299 | 299 | 'ct_rev_id' => $this->mId, |
| 300 | 300 | 'ct_tag' => $this->normalizeTag( $tag ) ); |
| 301 | 301 | } |
| — | — | @@ -332,7 +332,7 @@ |
| 333 | 333 | $row = $dbr->selectRow( 'code_rev', |
| 334 | 334 | 'cr_id', |
| 335 | 335 | array( |
| 336 | | - 'cr_repo_id' => $this->mRepo, |
| | 336 | + 'cr_repo_id' => $this->mRepoId, |
| 337 | 337 | "cr_id > $encId" ), |
| 338 | 338 | __METHOD__, |
| 339 | 339 | array( |
| — | — | @@ -352,7 +352,7 @@ |
| 353 | 353 | $row = $dbr->selectRow( 'code_rev', |
| 354 | 354 | 'cr_id', |
| 355 | 355 | array( |
| 356 | | - 'cr_repo_id' => $this->mRepo, |
| | 356 | + 'cr_repo_id' => $this->mRepoId, |
| 357 | 357 | "cr_id > $encId", |
| 358 | 358 | 'cr_status' => array('new','fixme') ), |
| 359 | 359 | __METHOD__, |