Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder

2016-12-26 10:08:31 -06:00 · 2016-12-26 10:08:31 -06:00 · a008b0ca76
parent 56277bce09 98083f58f1
commit a008b0ca76
47 changed files with 0 additions and 1 deletions
--- a/web/api/app/Console/Command/Task/empty
+++ b/web/api/app/Console/Command/Task/empty
--- a/web/api/app/Console/Templates/empty
+++ b/web/api/app/Console/Templates/empty
--- a/web/api/app/Controller/Component/empty
+++ b/web/api/app/Controller/Component/empty
--- a/web/api/app/Lib/empty
+++ b/web/api/app/Lib/empty
--- a/web/api/app/Locale/eng/LC_MESSAGES/empty
+++ b/web/api/app/Locale/eng/LC_MESSAGES/empty
--- a/web/api/app/Model/Behavior/empty
+++ b/web/api/app/Model/Behavior/empty
--- a/web/api/app/Model/Datasource/empty
+++ b/web/api/app/Model/Datasource/empty
--- a/web/api/app/Plugin/empty
+++ b/web/api/app/Plugin/empty
--- a/web/api/app/Test/Case/Controller/Component/empty
+++ b/web/api/app/Test/Case/Controller/Component/empty
--- a/web/api/app/Test/Case/Model/Behavior/empty
+++ b/web/api/app/Test/Case/Model/Behavior/empty
--- a/web/api/app/Test/Case/View/Helper/empty
+++ b/web/api/app/Test/Case/View/Helper/empty
--- a/web/api/app/Test/Fixture/empty
+++ b/web/api/app/Test/Fixture/empty
--- a/web/api/app/Vendor/empty
+++ b/web/api/app/Vendor/empty
--- a/web/api/app/View/Elements/empty
+++ b/web/api/app/View/Elements/empty
--- a/web/api/app/View/Scaffolds/empty
+++ b/web/api/app/View/Scaffolds/empty
--- a/web/api/app/View/View/Elements/empty
+++ b/web/api/app/View/View/Elements/empty
--- a/web/api/app/View/View/Scaffolds/empty
+++ b/web/api/app/View/View/Scaffolds/empty
--- a/web/api/app/webroot/files/empty
+++ b/web/api/app/webroot/files/empty
--- a/web/api/app/webroot/js/empty
+++ b/web/api/app/webroot/js/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Console/Templates/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Controller/Component/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Controller/Component/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Lib/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Lib/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Plugin/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Plugin/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty
--- a/web/api/lib/Cake/Console/Templates/skel/Vendor/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/Vendor/empty
--- a/web/api/lib/Cake/Console/Templates/skel/View/Elements/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Elements/empty
--- a/web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty
--- a/web/api/lib/Cake/Console/Templates/skel/webroot/files/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/webroot/files/empty
--- a/web/api/lib/Cake/Console/Templates/skel/webroot/js/empty
+++ b/web/api/lib/Cake/Console/Templates/skel/webroot/js/empty
--- a/web/api/lib/Cake/Test/test_app/Console/Command/Task/empty
+++ b/web/api/lib/Cake/Test/test_app/Console/Command/Task/empty
--- a/web/api/lib/Cake/Test/test_app/Controller/Component/empty
+++ b/web/api/lib/Cake/Test/test_app/Controller/Component/empty
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
--- a/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty
+++ b/web/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty
--- a/web/api/lib/Cake/Test/test_app/View/Scaffolds/empty
+++ b/web/api/lib/Cake/Test/test_app/View/Scaffolds/empty
--- a/web/api/lib/Cake/Test/test_app/tmp/empty
+++ b/web/api/lib/Cake/Test/test_app/tmp/empty
--- a/web/index.php
+++ b/web/index.php
@ -109,7 +109,6 @@ define( "ZM_SKIN_PATH", "skins/$skin" );
 $skinBase = array(); // To allow for inheritance of skins
 if ( !file_exists( ZM_SKIN_PATH ) )
    Fatal( "Invalid skin '$skin'" );
-require_once( ZM_SKIN_PATH.'/includes/init.php' );
 $skinBase[] = $skin;

 ini_set( "session.name", "ZMSESSID" );
--- a/web/skins/classic/includes/init.php
+++ b/web/skins/classic/includes/init.php
--- a/web/skins/classic/views/js/plugin.js.php
+++ b/web/skins/classic/views/js/plugin.js.php
--- a/web/skins/classic/views/nph-zms
+++ b/web/skins/classic/views/nph-zms