BUGFIX: Use the copy of symfony-yaml bundled with Zend_Translate to p…

…revent class conflicts. Remove now-unnecessary symonfy-yaml thirdparty lib.

core/manifest/ConfigManifest.php

@@ -176,9 +176,8 @@ public function addYAMLConfigFile($basename, $pathname, $depth) {
 		// Keep track of all the modules we've seen
 		$this->addModule(dirname(dirname($pathname)));
 
-		// We use Symfony Yaml since it's the most complete. It still doesn't handle all of YAML, but it's better than
-		// nothing.
-		if(!class_exists('sfYamlParser', false)) require_once 'thirdparty/symfony-yaml/lib/sfYamlParser.php';
+		// Use the Zend copy of this script to prevent class conflicts when RailsYaml is included
+		require_once 'thirdparty/zend_translate_railsyaml/library/Translate/Adapter/thirdparty/sfYaml/lib/sfYamlParser.php';
 		$parser = new sfYamlParser();
 
 		// The base header

i18n/i18nTextCollector.php

@@ -495,8 +495,8 @@ public function write($entities, $locale, $path) {
 	}
 
 	public function getYaml($entities, $locale) {
-		// Check required because Zend_Translate_RailsYAML also includes the lib, from a different location
-		if(!class_exists('sfYamlDumper', false)) require_once 'thirdparty/symfony-yaml/lib/sfYamlDumper.php';
+		// Use the Zend copy of this script to prevent class conflicts when RailsYaml is included
+		require_once 'thirdparty/zend_translate_railsyaml/library/Translate/Adapter/thirdparty/sfYaml/lib/sfYamlDumper.php';
 
 		// Unflatten array
 		$entitiesNested = array();