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

(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41906 467b73ca-7a2a-4603-9d3b-597d59a354a9

core/ManifestBuilder.php

@@ -202,7 +202,7 @@ class ManifestBuilder {
 							This might mean that the wrong code is being used.", E_USER_WARNING);
 					} else {
 						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 {
 					$classMap[$itemCode] = "$folder/$item";

core/model/DataObject.php

@@ -642,7 +642,6 @@ class DataObject extends Controller {
 	 */
 	public function getComponents($componentName, $filter = "", $sort = "", $join = "", $limit = "", $having = "") {
     	// 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]) {
 	    	return $this->componentCache[$componentName];
     	}
@@ -701,7 +700,6 @@ class DataObject extends Controller {
 		// (mostly the classname of the calling DataObject)
 		foreach($allClasses as $class) {
 			// if this class does a "has-one"-representation, use it
-			if(isset($reversedComponentRelations[$class])) {
 			if(isset($reversedComponentRelations[$class]) && false != $reversedComponentRelations[$class]) {
 				$joinField = $reversedComponentRelations[$class] . 'ID';
 				break;

security/Auth/Yadis/XRDS.php

@@ -16,7 +16,7 @@
 /**
  * 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
@@ -445,4 +445,4 @@ class Auth_Yadis_XRDS {
     }
 }
 
-?>
+?>