Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67268
Change subject: Prevent warning when importing jump config (no questions)
......................................................................
Prevent warning when importing jump config (no questions)
Change-Id: I5235efc319797d75487f27ed87f5a0dbc8905072
Warning: Invalid argument supplied for foreach()
---
M cli/import.php
1 file changed, 25 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/68/67268/1
diff --git a/cli/import.php b/cli/import.php
index 50e233e..eb5f8ab 100644
--- a/cli/import.php
+++ b/cli/import.php
@@ -187,31 +187,33 @@
__METHOD__ );
$sourceIds[] = $electionInfo['id'];
- # Questions
- $index = 1;
- foreach ( $electionInfo['questions'] as $questionInfo ) {
- spInsertEntity( 'question', $questionInfo['id'] );
- $dbw->insert( 'securepoll_questions',
- array(
- 'qu_entity' => $questionInfo['id'],
- 'qu_election' => $electionInfo['id'],
- 'qu_index' => $index++,
- ),
- __METHOD__ );
- $sourceIds[] = $questionInfo['id'];
+ if ( isset( $electionInfo['questions'] ) ) {
+ # Questions
+ $index = 1;
+ foreach ( $electionInfo['questions'] as $questionInfo ) {
+ spInsertEntity( 'question', $questionInfo['id'] );
+ $dbw->insert( 'securepoll_questions',
+ array(
+ 'qu_entity' => $questionInfo['id'],
+ 'qu_election' => $electionInfo['id'],
+ 'qu_index' => $index++,
+ ),
+ __METHOD__ );
+ $sourceIds[] = $questionInfo['id'];
- # Options
- $insertBatch = array();
- foreach ( $questionInfo['options'] as $optionInfo ) {
- spInsertEntity( 'option', $optionInfo['id'] );
- $insertBatch[] = array(
- 'op_entity' => $optionInfo['id'],
- 'op_election' => $electionInfo['id'],
- 'op_question' => $questionInfo['id']
- );
- $sourceIds[] = $optionInfo['id'];
+ # Options
+ $insertBatch = array();
+ foreach ( $questionInfo['options'] as $optionInfo ) {
+ spInsertEntity( 'option', $optionInfo['id'] );
+ $insertBatch[] = array(
+ 'op_entity' => $optionInfo['id'],
+ 'op_election' => $electionInfo['id'],
+ 'op_question' => $questionInfo['id']
+ );
+ $sourceIds[] = $optionInfo['id'];
+ }
+ $dbw->insert( 'securepoll_options', $insertBatch,
__METHOD__ );
}
- $dbw->insert( 'securepoll_options', $insertBatch, __METHOD__ );
}
# Messages
--
To view, visit https://gerrit.wikimedia.org/r/67268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5235efc319797d75487f27ed87f5a0dbc8905072
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
