Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
This commit is contained in:
commit
a008b0ca76
|
@ -109,7 +109,6 @@ define( "ZM_SKIN_PATH", "skins/$skin" );
|
||||||
$skinBase = array(); // To allow for inheritance of skins
|
$skinBase = array(); // To allow for inheritance of skins
|
||||||
if ( !file_exists( ZM_SKIN_PATH ) )
|
if ( !file_exists( ZM_SKIN_PATH ) )
|
||||||
Fatal( "Invalid skin '$skin'" );
|
Fatal( "Invalid skin '$skin'" );
|
||||||
require_once( ZM_SKIN_PATH.'/includes/init.php' );
|
|
||||||
$skinBase[] = $skin;
|
$skinBase[] = $skin;
|
||||||
|
|
||||||
ini_set( "session.name", "ZMSESSID" );
|
ini_set( "session.name", "ZMSESSID" );
|
||||||
|
|
Loading…
Reference in New Issue