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

mlantahler: Reverted Sam's changes because now we can exclude directories from the ManifestBuilder? simply by adding a "_manifest_exclude" file.

Browse Source 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41906 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-15 01:55:55 +00:00
parent 3b5a0862f3
commit d292e5ccf0
5 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ManifestBuilder.php
View File

@ -202,7 +202,7 @@ class ManifestBuilder {
This might mean that the wrong code is being used.", E_USER_WARNING); This might mean that the wrong code is being used.", E_USER_WARNING);
} else { } else {
user_error("Warning: there are two '$itemCode' files with the same filename: '$folder/$item' and '{$classMap[$itemCode]}'. user_error("Warning: there are two '$itemCode' files with the same filename: '$folder/$item' and '{$classMap[$itemCode]}'.
This might mean that the wrong code is being used.", E_USER_WARNING); This might mean that the wrong code is being used.", E_USER_NOTICE);
} }
} else { } else {
$classMap[$itemCode] = "$folder/$item"; $classMap[$itemCode] = "$folder/$item";

2
core/model/DataObject.php
View File

@ -642,7 +642,6 @@ class DataObject extends Controller {
*/ */
public function getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = "", $having = "") { public function getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = "", $having = "") {
// TODO Does not take different SQL-parameters into account on subsequent calls // TODO Does not take different SQL-parameters into account on subsequent calls
if(isset($this->componentCache[$componentName])) {
if(isset($this->componentCache[$componentName]) && false != $this->componentCache[$componentName]) { if(isset($this->componentCache[$componentName]) && false != $this->componentCache[$componentName]) {
return $this->componentCache[$componentName]; return $this->componentCache[$componentName];
} }
@ -701,7 +700,6 @@ class DataObject extends Controller {
// (mostly the classname of the calling DataObject) // (mostly the classname of the calling DataObject)
foreach($allClasses as $class) { foreach($allClasses as $class) {
// if this class does a "has-one"-representation, use it // if this class does a "has-one"-representation, use it
if(isset($reversedComponentRelations[$class])) {
if(isset($reversedComponentRelations[$class]) && false != $reversedComponentRelations[$class]) { if(isset($reversedComponentRelations[$class]) && false != $reversedComponentRelations[$class]) {
$joinField = $reversedComponentRelations[$class] . 'ID'; $joinField = $reversedComponentRelations[$class] . 'ID';
break; break;

0
security/Auth/Yadis/Auth_Yadis_XMLParser.php → security/Auth/Yadis/XML.php
View File

4
security/Auth/Yadis/XRDS.php
View File

@ -16,7 +16,7 @@
/** /**
* Require the XPath implementation. * Require the XPath implementation.
*/ */
require_once 'Auth/Yadis/Auth_Yadis_XMLParser.php'; require_once 'Auth/Yadis/XML.php';
/** /**
* This match mode means a given service must match ALL filters passed * This match mode means a given service must match ALL filters passed
@ -445,4 +445,4 @@ class Auth_Yadis_XRDS {
} }
} }
?> ?>

0
security/Auth/_manifest_exclude Normal file
View File