← Back to branch summary

~xibo-maintainers/xibo/brorsen

~xibo-maintainers/xibo/brorsen

« back to all changes in this revision

Viewing changes to server/modules/ticker.module.php

Committer: Dan Garner
Date: 2012-12-02 17:48:21 UTC
mfrom: (263.2.6 server-141)
Revision ID: dan@xibo.org.uk-20121202174821-75l9ic7d9s95t1sa

Merged server-141

files added:
server/install/database/50.php

server/install/database/51.sql

files modified:
server/lib/include.php

server/lib/js/layout.js

server/lib/modules/module.class.php

server/lib/pages/display.class.php

server/lib/pages/module.class.php

server/modules/counter.module.php

server/modules/datasetview.module.php

server/modules/image.module.php

server/modules/shellcommand.module.php

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/webpage.module.php

Show diffs side-by-side

added added

removed removed

server/modules/ticker.module.php

468

468

*/

469

469

public function Preview($width, $height)

470

470

{

471

if ($this->previewEnabled == 0)

472

return parent::Preview ($width, $height);

473

471

474

$layoutId = $this->layoutid;

472

475

$regionId = $this->regionid;

473

476

Older »