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 Workaround for duplicate require_once calls of same class in two locations (SS core and Zend_Translate_RailsYAML)

Browse Source
This commit is contained in:
Ingo Schommer 2012-04-15 18:45:39 +02:00
parent d3b63dae0c
commit c649fa3acf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
i18n/i18nTextCollector.php
View File

@ -481,6 +481,7 @@ class i18nTextCollector_Writer_RailsYaml implements i18nTextCollector_Writer {
} }
public function getYaml($entities, $locale) { 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'; if(!class_exists('sfYamlDumper', false)) require_once 'thirdparty/symfony-yaml/lib/sfYamlDumper.php';
// Unflatten array // Unflatten array

6
thirdparty/zend_translate_railsyaml/library/Translate/Adapter/RailsYAML.php vendored
View File

@ -6,7 +6,11 @@ require_once 'Zend/Locale.php';
/** Zend_Translate_Adapter */ /** Zend_Translate_Adapter */
require_once 'Zend/Translate/Adapter.php'; require_once 'Zend/Translate/Adapter.php';
// require_once 'thirdparty/sfYaml/lib/sfYaml.php'; // ischommer CUSTOM Check required because SS core also includes the lib, from a different location
if(!class_exists('sfYaml')) require_once 'thirdparty/sfYaml/lib/sfYaml.php';
if(!class_exists('sfYamlParser')) require_once 'thirdparty/sfYaml/lib/sfYamlParser.php';
if(!class_exists('sfYamlDumper')) require_once 'thirdparty/sfYaml/lib/sfYamlDumper.php';
// ischommer END_CUSTOM
class Translate_Adapter_RailsYaml extends Zend_Translate_Adapter { class Translate_Adapter_RailsYaml extends Zend_Translate_Adapter {