ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed skinSeq to skinBase 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2596 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2008-07-23 09:57:11 +00:00
parent 03611d70c9
commit 0f0a8c004f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/includes/functions.php
View File

@ -2122,9 +2122,9 @@ function generateConnKey()
function getSkinFile( $file ) function getSkinFile( $file )
{ {
global $skinSeq; global $skinBase;
$skinFile = false; $skinFile = false;
foreach ( $skinSeq as $skin ) foreach ( $skinBase as $skin )
{ {
$tempSkinFile = 'skins'.'/'.$skin.'/'.$file; $tempSkinFile = 'skins'.'/'.$skin.'/'.$file;
if ( file_exists( $tempSkinFile ) ) if ( file_exists( $tempSkinFile ) )
@ -2135,9 +2135,9 @@ function getSkinFile( $file )
function getSkinIncludes( $file, $includeBase=false, $asOverride=false ) function getSkinIncludes( $file, $includeBase=false, $asOverride=false )
{ {
global $skinSeq; global $skinBase;
$skinFile = false; $skinFile = false;
foreach ( $skinSeq as $skin ) foreach ( $skinBase as $skin )
{ {
$tempSkinFile = 'skins'.'/'.$skin.'/'.$file; $tempSkinFile = 'skins'.'/'.$skin.'/'.$file;
if ( file_exists( $tempSkinFile ) ) if ( file_exists( $tempSkinFile ) )

4
web/index.php
View File

@ -66,11 +66,11 @@ else
define( "ZM_BASE_PATH", dirname( $_SERVER['REQUEST_URI'] ) ); define( "ZM_BASE_PATH", dirname( $_SERVER['REQUEST_URI'] ) );
define( "ZM_SKIN_PATH", "skins/$skin" ); define( "ZM_SKIN_PATH", "skins/$skin" );
$skinSeq = 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 ) )
die( "Invalid skin '$skin'" ); die( "Invalid skin '$skin'" );
require_once( ZM_SKIN_PATH.'/includes/init.php' ); require_once( ZM_SKIN_PATH.'/includes/init.php' );
$skinSeq[] = $skin; $skinBase[] = $skin;
ini_set( "session.name", "ZMSESSID" ); ini_set( "session.name", "ZMSESSID" );