| @@ 658-674 (lines=17) @@ | ||
| 655 | } |
|
| 656 | } |
|
| 657 | // Second pass to finish conversion |
|
| 658 | foreach ($rows as $i => $row) { |
|
| 659 | if ($row instanceof \ElggEntity) { |
|
| 660 | continue; |
|
| 661 | } else { |
|
| 662 | try { |
|
| 663 | $rows[$i] = entity_row_to_elggstar($row); |
|
| 664 | } catch (IncompleteEntityException $e) { |
|
| 665 | // don't let incomplete entities throw fatal errors |
|
| 666 | unset($rows[$i]); |
|
| 667 | ||
| 668 | // report incompletes to the batch process that spawned this query |
|
| 669 | if ($batch) { |
|
| 670 | $batch->reportIncompleteEntity($row); |
|
| 671 | } |
|
| 672 | } |
|
| 673 | } |
|
| 674 | } |
|
| 675 | return $rows; |
|
| 676 | } |
|
| 677 | ||
| @@ 160-176 (lines=17) @@ | ||
| 157 | } |
|
| 158 | } |
|
| 159 | // Second pass to finish conversion |
|
| 160 | foreach ($rows as $i => $row) { |
|
| 161 | if ($row instanceof \ElggEntity) { |
|
| 162 | continue; |
|
| 163 | } else { |
|
| 164 | try { |
|
| 165 | $rows[$i] = entity_row_to_elggstar($row); |
|
| 166 | } catch (IncompleteEntityException $e) { |
|
| 167 | // don't let incomplete entities throw fatal errors |
|
| 168 | unset($rows[$i]); |
|
| 169 | ||
| 170 | // report incompletes to the batch process that spawned this query |
|
| 171 | if ($batch) { |
|
| 172 | $batch->reportIncompleteEntity($row); |
|
| 173 | } |
|
| 174 | } |
|
| 175 | } |
|
| 176 | } |
|
| 177 | return $rows; |
|
| 178 | } |
|
| 179 | ||