| Index: trunk/extensions/UploadWizard/includes/UploadWizardCampaign.php |
| — | — | @@ -295,7 +295,7 @@ |
| 296 | 296 | |
| 297 | 297 | foreach ( $config as $settingName => &$settingValue ) { |
| 298 | 298 | if ( is_array( $defaultConfig[$settingName]['default'] ) && !is_array( $settingValue ) ) { |
| 299 | | - $parts = explode( ', ', $settingValue ); |
| | 299 | + $parts = explode( '| ', $settingValue ); |
| 300 | 300 | $settingValue = array(); |
| 301 | 301 | |
| 302 | 302 | foreach ( $parts as $part ) { |
| — | — | @@ -485,7 +485,7 @@ |
| 486 | 486 | array( |
| 487 | 487 | 'cc_campaign_id' => $this->id, |
| 488 | 488 | 'cc_property' => $prop, |
| 489 | | - 'cc_value' => is_array( $value ) ? implode( ', ', $value ) : $value |
| | 489 | + 'cc_value' => is_array( $value ) ? implode( '| ', $value ) : $value |
| 490 | 490 | ) |
| 491 | 491 | ); |
| 492 | 492 | } |
| Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php |
| — | — | @@ -311,8 +311,8 @@ |
| 312 | 312 | 'mwe-upwiz-campaign-name' => 'Campaign name', |
| 313 | 313 | 'mwe-upwiz-campaign-enabled' => 'Campaign enabled', |
| 314 | 314 | 'mwe-upwiz-campaign-conf-skipTutorial' => 'Skip the licensing tutorial', |
| 315 | | - 'mwe-upwiz-campaign-conf-autoCategories' => 'Categories to add the files to automatically and silently (comma separated)', |
| 316 | | - 'mwe-upwiz-campaign-conf-defaultCategories' => 'Default categories to list in the describe tab (comma separated)', |
| | 315 | + 'mwe-upwiz-campaign-conf-autoCategories' => 'Categories to add the files to automatically and silently (pipe separated)', |
| | 316 | + 'mwe-upwiz-campaign-conf-defaultCategories' => 'Default categories to list in the describe tab (pipe separated)', |
| 317 | 317 | 'mwe-upwiz-campaign-conf-autoWikiText' => 'WikiText to automatically add to all uploaded images', |
| 318 | 318 | 'mwe-upwiz-campaign-conf-ownWorkOption' => 'How to handle own-work or not own-work', |
| 319 | 319 | 'mwe-upwiz-campaign-owner-choice' => 'Allow the user to choose between own work and non-own work', |