diff --git a/include/class.faq.php b/include/class.faq.php index 027b25ef09815a24ab775ba55ed9e639393f3eb1..4eb1c2d83df46c4953ed0712c1cb03c5a8d913ba 100644 --- a/include/class.faq.php +++ b/include/class.faq.php @@ -297,23 +297,6 @@ class FAQ extends VerySimpleModel { return $att; } - function getAttachmentsLinks($separator=' ',$target='') { - - $str=''; - if ($attachments = $this->getLocalAttachments()->all()) { - foreach($attachments as $attachment ) { - /* The h key must match validation in file.php */ - if($attachment['size']) - $size=sprintf(' <small>(<i>%s</i>)</small>',Format::file_size($attachment['size'])); - - $str.=sprintf('<a class="Icon file no-pjax" href="%s" target="%s">%s</a>%s %s', - $attachment['download_url'], $target, Format::htmlchars($attachment['name']), $size, $separator); - - } - } - return $str; - } - function delete() { try { parent::delete(); diff --git a/include/class.orm.php b/include/class.orm.php index c71f0e1e60f4e8e5e0aac99a8bfca98d89fcba8b..3e5d6663011a23b5c6ad47c5e1662e1e54fb4997 100644 --- a/include/class.orm.php +++ b/include/class.orm.php @@ -1138,7 +1138,7 @@ class QuerySet implements IteratorAggregate, ArrayAccess, Serializable, Countabl } function all() { - return $this->getIterator(); + return $this->getIterator()->asArray(); } function first() { diff --git a/include/class.task.php b/include/class.task.php index 2c93eac120ff139cdc74eec8918f265cf358082a..6c4a30601be31912d6154cb1a490a1dbf85f3d79 100644 --- a/include/class.task.php +++ b/include/class.task.php @@ -846,8 +846,8 @@ class Task extends TaskModel implements RestrictedAccess, Threadable { } } elseif ($cfg->alertDeptMembersONTaskTransfer() && !$this->isAssigned()) { // Only alerts dept members if the task is NOT assigned. - if ($members = $dept->getMembersForAlerts()->all()) - $recipients = array_merge($recipients, $members); + foreach ($dept->getMembersForAlerts() as $M) + $recipients[] = $M; } // Always alert dept manager?? diff --git a/include/class.ticket.php b/include/class.ticket.php index 8f5dd5551bc713fa6d10bb8340806caf1f58317a..10f6b7a0ea5ceb58e443003a0b2e27c8c08755bf 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -1818,8 +1818,8 @@ implements RestrictedAccess, Threadable { } elseif ($cfg->alertDeptMembersONOverdueTicket() && !$this->isAssigned()) { // Only alerts dept members if the ticket is NOT assigned. - if ($members = $dept->getMembersForAlerts()->all()) - $recipients = array_merge($recipients, $members); + foreach ($dept->getMembersForAlerts() as $M) + $recipients[] = $M; } // Always alert dept manager?? if ($cfg->alertDeptManagerONOverdueTicket() @@ -2082,8 +2082,8 @@ implements RestrictedAccess, Threadable { } elseif ($cfg->alertDeptMembersONTransfer() && !$this->isAssigned()) { // Only alerts dept members if the ticket is NOT assigned. - if ($members = $dept->getMembersForAlerts()->all()) - $recipients = array_merge($recipients, $members); + foreach ($dept->getMembersForAlerts() as $M) + $recipients[] = $M; } // Always alert dept manager?? diff --git a/include/class.translation.php b/include/class.translation.php index 2d503baf654697a0be78d8371b7a614cd095a00f..2e864b39383fd0dc26b4244eb4f68e304eb532d8 100644 --- a/include/class.translation.php +++ b/include/class.translation.php @@ -1033,7 +1033,7 @@ class CustomDataTranslation extends VerySimpleModel { $criteria['lang'] = $lang; try { - return static::objects()->filter($criteria)->all()->asArray(); + return static::objects()->filter($criteria)->all(); } catch (OrmException $e) { // Translation table might not exist yet — happens on the upgrader diff --git a/include/client/templates/sidebar.tmpl.php b/include/client/templates/sidebar.tmpl.php index 682f88d7bf9ee8e5ac10070049630291eba1c07d..09f9bd689c80c7be183b95bde2de14084c3ce031 100644 --- a/include/client/templates/sidebar.tmpl.php +++ b/include/client/templates/sidebar.tmpl.php @@ -20,7 +20,7 @@ $BUTTONS = isset($BUTTONS) ? $BUTTONS : true; <?php } ?> <div class="content"><?php $faqs = FAQ::getFeatured()->select_related('category')->limit(5); - if (count($faqs)) { ?> + if ($faqs->all()) { ?> <section><div class="header"><?php echo __('Featured Questions'); ?></div> <?php foreach ($faqs as $F) { ?> <div><a href="<?php echo ROOT_PATH; ?>kb/faq.php?id=<?php diff --git a/include/client/templates/thread-entries.tmpl.php b/include/client/templates/thread-entries.tmpl.php index 1f2c1eed4e3144259475b76b1dd9054dbeded451..edd71b4a8a0e927a34d067537522b1b8f487f72c 100644 --- a/include/client/templates/thread-entries.tmpl.php +++ b/include/client/templates/thread-entries.tmpl.php @@ -2,7 +2,7 @@ $events = $events ->filter(array('state__in' => array('created', 'closed', 'reopened', 'edited', 'collab'))) ->order_by('id'); -$events = new IteratorIterator($events->all()); +$events = new IteratorIterator($events->getIterator()); $events->rewind(); $event = $events->current(); diff --git a/include/staff/templates/thread-entries.tmpl.php b/include/staff/templates/thread-entries.tmpl.php index 8786472e5f16b52f59eb3e59857254ee3c8e1a3f..0d15aa0c9f15dfd410a9c60914a5c17ef67d3ab5 100644 --- a/include/staff/templates/thread-entries.tmpl.php +++ b/include/staff/templates/thread-entries.tmpl.php @@ -10,7 +10,7 @@ $cmp = function ($a, $b) use ($sort) { }; $events = $events->order_by($sort); -$events = new IteratorIterator($events->all()); +$events = new IteratorIterator($events->getIterator()); $events->rewind(); $event = $events->current(); $htmlId = $options['html-id'] ?: ('thread-'.$this->getId());