tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Fixed spaces with tabs in Core (from r113924)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114540 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-12-05 08:37:31 +00:00
parent 567c0b4939
commit edc7a46d21
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/Core.php
View File

@ -216,18 +216,15 @@ set_include_path(str_replace('.' . PATH_SEPARATOR, '.' . PATH_SEPARATOR
* Class names are converted to lowercase for lookup to adhere to PHP's case-insensitive * Class names are converted to lowercase for lookup to adhere to PHP's case-insensitive
* way of dealing with them. * way of dealing with them.
*/ */
function sapphire_autoload($className) function sapphire_autoload($className) {
{
global $_CLASS_MANIFEST; global $_CLASS_MANIFEST;
$lClassName = strtolower($className); $lClassName = strtolower($className);
if(isset($_CLASS_MANIFEST[$lClassName])) include_once($_CLASS_MANIFEST[$lClassName]); if(isset($_CLASS_MANIFEST[$lClassName])) include_once($_CLASS_MANIFEST[$lClassName]);
else if(isset($_CLASS_MANIFEST[$className])) include_once($_CLASS_MANIFEST[$className]); else if(isset($_CLASS_MANIFEST[$className])) include_once($_CLASS_MANIFEST[$className]);
} }
spl_autoload_register('sapphire_autoload'); spl_autoload_register('sapphire_autoload');
require_once("core/ManifestBuilder.php"); require_once("core/ManifestBuilder.php");
require_once("core/ClassInfo.php"); require_once("core/ClassInfo.php");
require_once('core/Object.php'); require_once('core/Object.php');
@ -267,15 +264,15 @@ Debug::loadErrorHandlers();
// HELPER FUNCTIONS // HELPER FUNCTIONS
function getSysTempDir() { function getSysTempDir() {
if(function_exists('sys_get_temp_dir')) { if(function_exists('sys_get_temp_dir')) {
$sysTmp = sys_get_temp_dir(); $sysTmp = sys_get_temp_dir();
} elseif(isset($_ENV['TMP'])) { } elseif(isset($_ENV['TMP'])) {
$sysTmp = $_ENV['TMP']; $sysTmp = $_ENV['TMP'];
} else { } else {
$tmpFile = tempnam('adfadsfdas',''); $tmpFile = tempnam('adfadsfdas','');
unlink($tmpFile); unlink($tmpFile);
$sysTmp = dirname($tmpFile); $sysTmp = dirname($tmpFile);
} }
return $sysTmp; return $sysTmp;
} }
@ -355,7 +352,7 @@ function singleton($className) {
if(!isset($className)) user_error("singleton() Called without a class", E_USER_ERROR); if(!isset($className)) user_error("singleton() Called without a class", E_USER_ERROR);
if(!is_string($className)) user_error("singleton() passed bad class_name: " . var_export($className,true), E_USER_ERROR); if(!is_string($className)) user_error("singleton() passed bad class_name: " . var_export($className,true), E_USER_ERROR);
if(!isset($_SINGLETONS[$className])) { if(!isset($_SINGLETONS[$className])) {
if(!class_exists($className)) user_error("Bad class to singleton() - $className", E_USER_ERROR); if(!class_exists($className)) user_error("Bad class to singleton() - $className", E_USER_ERROR);
$_SINGLETONS[$className] = Object::strong_create($className,null, true); $_SINGLETONS[$className] = Object::strong_create($className,null, true);
if(!$_SINGLETONS[$className]) user_error("singleton() Unknown class '$className'", E_USER_ERROR); if(!$_SINGLETONS[$className]) user_error("singleton() Unknown class '$className'", E_USER_ERROR);
} }
@ -426,5 +423,3 @@ function increase_time_limit_to($timeLimit = null) {
} }
} }
} }
?>