From a1b0987c23f946408aaf44c692c7981b5d59c174 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 11 Aug 2008 03:11:48 +0000
Subject: [PATCH] (blocked bidirectional merge from trunk into branches/roa)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60336 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/YamlFixture.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/model/YamlFixture.php b/core/model/YamlFixture.php
index 3898e2ba3..fa8f8684e 100644
--- a/core/model/YamlFixture.php
+++ b/core/model/YamlFixture.php
@@ -92,7 +92,7 @@ class YamlFixture extends Object {
 	 * @param $className The data class, as specified in your fixture file.  Parent classes won't work
 	 * @param $identifier The identifier string, as provided in your fixture file
 	 */
-	protected function idFromFixture($className, $identifier) {
+	public function idFromFixture($className, $identifier) {
 		return $this->fixtureDictionary[$className][$identifier];
 	}
 	
@@ -101,7 +101,7 @@ class YamlFixture extends Object {
 	 * 
 	 * @return A map of fixture-identifier => object-id
 	 */
-	protected function allFixtureIDs($className) {
+	public function allFixtureIDs($className) {
 		return $this->fixtureDictionary[$className];
 	}
 
@@ -111,7 +111,7 @@ class YamlFixture extends Object {
 	 * @param $className The data class, as specified in your fixture file.  Parent classes won't work
 	 * @param $identifier The identifier string, as provided in your fixture file
 	 */
-	protected function objFromFixture($className, $identifier) {
+	public function objFromFixture($className, $identifier) {
 		return DataObject::get_by_id($className, $this->idFromFixture($className, $identifier));
 	}
 	
@@ -119,7 +119,7 @@ class YamlFixture extends Object {
 	 * Load a YAML fixture file into the database.
 	 * Once loaded, you can use idFromFixture() and objFromFixture() to get items from the fixture
 	 */
-	function saveIntoDatabase() {
+	public function saveIntoDatabase() {
 		$parser = new Spyc();
 		$fixtureContent = $parser->load(Director::baseFolder().'/'.$this->fixtureFile);
 		$this->fixtureDictionary = array();