← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Middleware/Actions.php

  • Committer: Dan Garner
  • Date: 2016-06-28 15:02:11 UTC
  • mto: This revision was merged to the branch mainline in revision 528.
  • Revision ID: git-v1:51031805c36c1d366fa330b2c2320d1927c57003
Fixes for upgrade steps

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Middleware/Actions.php
51
51
                foreach (array_diff(scandir($folder), array('..', '.')) as $file) {
52
52
                    if (stripos($file, '.zip')) {
53
53
                        /** @var \Xibo\Entity\Layout $layout */
54
 
                        $layout = $app->layoutFactory->createFromZip($folder . '/' . $file, null, 1, false, false, true, $app->container->get('\Xibo\Controller\Library')->setApp($app));
 
54
                        $layout = $app->layoutFactory->createFromZip($folder . '/' . $file, null, 1, false, false, true, false, true, $app->container->get('\Xibo\Controller\Library')->setApp($app));
55
55
                        $layout->save([
56
56
                            'audit' => false
57
57
                        ]);
58
58
                    }
59
59
                }
60
60
 
 
61
                // Layouts imported
 
62
                $app->configService->ChangeSetting('DEFAULTS_IMPORTED', 1);
 
63
 
61
64
                // Install files
62
65
                $app->container->get('\Xibo\Controller\Library')->installAllModuleFiles();
63
 
 
64
 
                $app->configService->ChangeSetting('DEFAULTS_IMPORTED', 1);
65
66
            }
66
67
 
67
68
            // Handle if we are an upgrade