|
@@ -124,7 +124,7 @@ |
|
|
block discarded – undo |
|
124
|
124
|
// TODO: Not the elegant way. Improvement neccessary |
|
125
|
125
|
foreach ($polls as $poll) { |
|
126
|
126
|
$combinedPoll = (object) array_merge( |
|
127
|
|
- (array) json_decode(json_encode($poll)), (array) json_decode(json_encode($this->acl->setPollId($poll->getId())))); |
|
|
127
|
+ (array) json_decode(json_encode($poll)), (array) json_decode(json_encode($this->acl->setPollId($poll->getId())))); |
|
128
|
128
|
if ($combinedPoll->allowView) { |
|
129
|
129
|
$pollList[] = $combinedPoll; |
|
130
|
130
|
} |
Please login to merge, or discard this patch.