http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95094
Revision: 95094
Author: jeroendedauw
Date: 2011-08-20 15:40:10 +0000 (Sat, 20 Aug 2011)
Log Message:
-----------
fu r95033
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.i18n.php
trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
Modified: trunk/extensions/UploadWizard/UploadWizard.i18n.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-08-20 15:36:12 UTC
(rev 95093)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-08-20 15:40:10 UTC
(rev 95094)
@@ -311,8 +311,8 @@
'mwe-upwiz-campaign-name' => 'Campaign name',
'mwe-upwiz-campaign-enabled' => 'Campaign enabled',
'mwe-upwiz-campaign-conf-skipTutorial' => 'Skip the licensing tutorial',
- 'mwe-upwiz-campaign-conf-autoCategories' => 'Categories to add the
files to automatically and silently (comma separated)',
- 'mwe-upwiz-campaign-conf-defaultCategories' => 'Default categories to
list in the describe tab (comma separated)',
+ 'mwe-upwiz-campaign-conf-autoCategories' => 'Categories to add the
files to automatically and silently (pipe separated)',
+ 'mwe-upwiz-campaign-conf-defaultCategories' => 'Default categories to
list in the describe tab (pipe separated)',
'mwe-upwiz-campaign-conf-autoWikiText' => 'WikiText to automatically
add to all uploaded images',
'mwe-upwiz-campaign-conf-ownWorkOption' => 'How to handle own-work or
not own-work',
'mwe-upwiz-campaign-owner-choice' => 'Allow the user to choose between
own work and non-own work',
Modified: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
===================================================================
--- trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2011-08-20 15:36:12 UTC (rev 95093)
+++ trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php
2011-08-20 15:40:10 UTC (rev 95094)
@@ -295,7 +295,7 @@
foreach ( $config as $settingName => &$settingValue ) {
if ( is_array( $defaultConfig[$settingName]['default']
) && !is_array( $settingValue ) ) {
- $parts = explode( ', ', $settingValue );
+ $parts = explode( '| ', $settingValue );
$settingValue = array();
foreach ( $parts as $part ) {
@@ -485,7 +485,7 @@
array(
'cc_campaign_id' => $this->id,
'cc_property' => $prop,
- 'cc_value' => is_array( $value ) ?
implode( ', ', $value ) : $value
+ 'cc_value' => is_array( $value ) ?
implode( '| ', $value ) : $value
)
);
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
