* (bug 1982) Fix loading of old text for section merging on edits.

1 files changed, 22 insertions, 0 deletions

diff --git a/includes/Revision.php b/includes/Revision.php
index 67eb4be6fcff..a42ccacbde08 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -36,6 +36,7 @@ class Revision {
 	 * @param int $id
 	 * @return Revision
 	 * @access public
+	 * @static
 	 */
 	function &newFromTitle( &$title, $id = 0 ) {
 		if( $id ) {
@@ -75,6 +76,27 @@ class Revision {
 	}
 	
 	/**
+	 * Load the revision for the given title with the given timestamp.
+	 * WARNING: Timestamps may in some circumstances not be unique,
+	 * so this isn't the best key to use.
+	 *
+	 * @param Database $db
+	 * @param Title $title
+	 * @param string $timestamp
+	 * @return Revision
+	 * @access public
+	 * @static
+	 */
+	function &loadFromTimestamp( &$db, &$title, $timestamp ) {
+		return Revision::loadFromConds(
+			$db,
+			array( 'rev_timestamp'  => $db->timestamp( $timestamp ),
+			       'page_id=rev_page',
+			       'page_namespace' => $title->getNamespace(),
+			       'page_title'     => $title->getDbkey() ) );
+	}
+	
+	/**
 	 * Given a set of conditions, fetch a revision.
 	 *
 	 * @param array $conditions