Revert r47530 "Fix bug 17571, now page1 would add to both cat1 and cat2."

Code is unclear; needs cleanup before adding more instances of this :D

diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php
index 0ffeb37..d1ac429 100644 (file)
--- a/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@ -428,25 +428,18 @@ class LinksUpdate {
        function getCategoryInsertions( $existing = array() ) {
                global $wgContLang;
                $diffs = array_diff_assoc( $this->mCategories, $existing );
-               foreach ( $this->mCategories as $name => $sortkey ) {
-                       $newname = $name;
-                       $nt = Title::makeTitleSafe( NS_CATEGORY, $newname );
-                       $wgContLang->findVariantLink( $newname, $nt, true );
+               $arr = array();
+               foreach ( $diffs as $name => $sortkey ) {
+                       $nt = Title::makeTitleSafe( NS_CATEGORY, $name );
+                       $wgContLang->findVariantLink( $name, $nt, true );
                        // for category redirection
                        if ( $nt->isRedirect() ) {
                                $at = new Article( $nt );
                                $nt = $at->getRedirectTarget();
-                               $newname = $nt->getText();
                                // we only redirect a category to another category
-                               if ( ! array_key_exists( $newname, $existing )
-                                        and $nt->getNamespace() == NS_CATEGORY )
-                                       $diffs[$newname] = $sortkey;
+                               if ( $nt->getNamespace() == NS_CATEGORY )
+                                       $name = $nt->getText();
                        }
-               }
-               $arr = array();
-               foreach ( $diffs as $name => $sortkey ) {
-                       $nt = Title::makeTitleSafe( NS_CATEGORY, $name );
-                       $wgContLang->findVariantLink( $name, $nt, true );
                        $arr[] = array(
                                'cl_from'    => $this->mId,
                                'cl_to'      => $name,