← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Xmds/Soap.php

  • Committer: Dan Garner
  • Date: 2018-05-21 14:58:11 UTC
  • mfrom: (644.1.8)
  • mto: (614.1.6)
  • mto: This revision was merged to the branch mainline in revision 648.
  • Revision ID: git-v1:e7961b0ebe68a0c0bc5dd7b3abca007138b2cadd
Merge branch 'bugfix/1.8.10-pack1' into feature/r-graph

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Xmds/Soap.php
644
644
                            $file->setAttribute('layoutid', $layoutId);
645
645
                            $file->setAttribute('regionid', $region->regionId);
646
646
                            $file->setAttribute('mediaid', $widget->widgetId);
647
 
                            $file->setAttribute('updated', ($layoutModifiedDt->greaterThan($widgetModifiedDt) ? $layoutModifiedDt : $widgetModifiedDt));
 
647
                            $file->setAttribute('updated', ($layoutModifiedDt->greaterThan($widgetModifiedDt) ? $layoutModifiedDt->format('U') : $widgetModifiedDt->format('U')));
648
648
                            $fileElements->appendChild($file);
649
649
                        }
650
650
                    }
1595
1595
            $requiredFile = $this->requiredFileFactory->getByDisplayAndWidget($this->display->displayId, $mediaId);
1596
1596
 
1597
1597
            $module = $this->moduleFactory->createWithWidget($this->widgetFactory->loadByWidgetId($mediaId), $this->regionFactory->getById($regionId));
1598
 
            $resource = $module->getResourceOrCache($this->display->displayId);
 
1598
            $resource = $module->getResourceOrCache($this->display->displayId, $this->regionFactory->getById($regionId));
1599
1599
 
1600
1600
            $requiredFile->bytesRequested = $requiredFile->bytesRequested + strlen($resource);
1601
1601
            $requiredFile->save();