Cboltz has submitted this change and it was merged.

Change subject: [Bug 24439] - Categories are not saved when doing upload of 
files
......................................................................


[Bug 24439] - Categories are not saved when doing upload of files

Change-Id: I7a0ff2e57735e4fcf69bd7ceee0772276d41ef9f
---
M CHANGELOG
M SelectCategory_body.php
2 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Cboltz: Verified; Looks good to me, approved



diff --git a/CHANGELOG b/CHANGELOG
index bc94815..1fb1a2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 Changes since the last release:
+  - [Bug 24439] - Categories are not saved when doing upload of files
   - [Bug 38374] option to disallow selecting the top-level category
     (new config option $wgSelectCategoryToplevelAllowed)
   - [Bug 24911] $wgSelectCategoryRoot ignored on Special:Upload
diff --git a/SelectCategory_body.php b/SelectCategory_body.php
index b192f21..6c3ea5d 100644
--- a/SelectCategory_body.php
+++ b/SelectCategory_body.php
@@ -160,7 +160,11 @@
                        }
                        # If it is an upload we have to call a different method
                        if ( $isUpload ) {
+                               # mUploadDescription has been renamed to 
mComment (not sure in which version,
+                               # 
http://www.mediawiki.org/wiki/Extension_talk:SelectCategoryTagCloud says it 
happened in 1.13 alpha or before, but I didn't confirm that).
+                               # mUploadDescription is kept for backwards 
compability.
                                $pageObj->mUploadDescription .= $text;
+                               $pageObj->mComment .= $text;
                        } else {
                                $pageObj->textbox1 .= $text;
                        }

-- 
To view, visit https://gerrit.wikimedia.org/r/51852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a0ff2e57735e4fcf69bd7ceee0772276d41ef9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SelectCategory
Gerrit-Branch: master
Gerrit-Owner: Cboltz <[email protected]>
Gerrit-Reviewer: Cboltz <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to