Merge "Rename class HWLDF_WordAccumulator to HWLDFWordAccumulator"

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index cd634c2..9a349f0 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -509,7 +509,7 @@ $wgAutoloadLocalClasses = array(
        'DiffOp_Change' => 'includes/diff/DairikiDiff.php',
        'DiffOp_Copy' => 'includes/diff/DairikiDiff.php',
        'DiffOp_Delete' => 'includes/diff/DairikiDiff.php',
-       'HWLDF_WordAccumulator' => 'includes/diff/DairikiDiff.php',
+       'HWLDFWordAccumulator' => 'includes/diff/DairikiDiff.php',
        'ArrayDiffFormatter' => 'includes/diff/ArrayDiffFormatter.php',
        'Diff' => 'includes/diff/DairikiDiff.php',
        'DifferenceEngine' => 'includes/diff/DifferenceEngine.php',

diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index 37f1e59..2271261 100644 (file)
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -870,7 +870,7 @@ class MappedDiff extends Diff {
  * @private
  * @ingroup DifferenceEngine
  */
-class HWLDF_WordAccumulator {
+class HWLDFWordAccumulator {
        private $lines = array();
        private $line = '';
        private $group = '';
@@ -1011,7 +1011,7 @@ class WordLevelDiff extends MappedDiff {
         */
        public function orig() {
                wfProfileIn( __METHOD__ );
-               $orig = new HWLDF_WordAccumulator;
+               $orig = new HWLDFWordAccumulator;
 
                foreach ( $this->edits as $edit ) {
                        if ( $edit->type == 'copy' ) {
@@ -1031,7 +1031,7 @@ class WordLevelDiff extends MappedDiff {
         */
        public function closing() {
                wfProfileIn( __METHOD__ );
-               $closing = new HWLDF_WordAccumulator;
+               $closing = new HWLDFWordAccumulator;
 
                foreach ( $this->edits as $edit ) {
                        if ( $edit->type == 'copy' ) {