* @access public
*/
function loadFromPageId( &$db, $pageid, $id = 0 ) {
+ $conds=array('page_id=rev_page','rev_page'=>intval( $pageid ), 'page_id'=>intval( $pageid ));
if( $id ) {
- $matchId = intval( $id );
+ $conds['rev_id']=intval($id);
} else {
- $matchId = 'page_latest';
+ $conds[]='rev_id=page_latest';
}
- $ret = Revision::loadFromConds(
- $db,
- array( "rev_id=$matchId",
- 'rev_page' => intval( $pageid ),
- 'page_id=rev_page' ) );
- return $ret;
+ return Revision::loadFromConds( $db, $conds );
}
/**