issue 2948, changed variable definition to __XE__

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12730 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2013-02-12 03:11:05 +00:00
parent c3647b3f99
commit 1379f68c92
21 changed files with 35 additions and 35 deletions

View file

@ -217,7 +217,7 @@ class adminAdminController extends admin
}
}
$buff = sprintf('<?php if(!defined("__ZBXE__")) exit();' . "\n" . 'if(!defined("__XE__")) exit();' . "\n" . '$designInfo = new stdClass();' . "\n" . '%s ?>', $buff);
$buff = sprintf('<?php if(!defined("__XE__")) exit();' . "\n" . '$designInfo = new stdClass();' . "\n" . '%s ?>', $buff);
$siteDesignFile = _XE_PATH_ . 'files/site_design/design_' . $site_srl . '.php';
FileHandler::writeFile($siteDesignFile, $buff);

View file

@ -320,7 +320,7 @@ class adminAdminModel extends admin
$info['package'] = _XE_PACKAGE_;
$info['host'] = $db_type->default_url ? $db_type->default_url : getFullUrl();
$info['app'] = $_SERVER['SERVER_SOFTWARE'];
$info['xe_version'] = __ZBXE_VERSION__;
$info['xe_version'] = __XE_VERSION__;
$info['php'] = phpversion();
$db_info = Context::getDBInfo();

View file

@ -205,7 +205,7 @@ class adminAdminView extends admin
// Retrieve recent news and set them into context,
// move from index method, because use in admin footer
$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __ZBXE_VERSION__, _XE_PACKAGE_);
$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < time())
{
@ -368,7 +368,7 @@ class adminAdminView extends admin
Context::set('newVersionList', $needUpdateList);
// gathering enviroment check
$mainVersion = join('.', array_slice(explode('.', __ZBXE_VERSION__), 0, 2));
$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
$path = FileHandler::getRealPath('./files/env/' . $mainVersion);
$isEnviromentGatheringAgreement = FALSE;
if(file_exists($path))
@ -481,7 +481,7 @@ class adminAdminView extends admin
$server = 'http://collect.xpressengine.com/env/img.php?';
$path = './files/env/';
$install_env = $path . 'install';
$mainVersion = join('.', array_slice(explode('.', __ZBXE_VERSION__), 0, 2));
$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
if(file_exists(FileHandler::getRealPath($install_env)))
{