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

BUG Fix incorrect include paths in tests and railsyml (#6279)

Browse Source
This commit is contained in:
Damian Mooyman 2016-11-03 14:41:19 +13:00 committed by Sam Minnée
parent ce10530f53
commit eefecc21fc
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/View/JSMinifier.php
View File

@ -15,7 +15,7 @@ class JSMinifier implements Requirements_Minifier {
// Combine JS // Combine JS
try { try {
require_once('thirdparty/jsmin/jsmin.php'); require_once('jsmin/jsmin.php');
increase_time_limit_to(); increase_time_limit_to();
$content = JSMin::minify($content); $content = JSMin::minify($content);
} catch(Exception $e) { } catch(Exception $e) {

2
tests/view/SSViewerTest.php
View File

@ -193,7 +193,7 @@ class SSViewerTest extends SapphireTest {
// first make sure that our test js file causes an exception to be thrown // first make sure that our test js file causes an exception to be thrown
try{ try{
require_once('thirdparty/jsmin/jsmin.php'); require_once('jsmin/jsmin.php');
JSMin::minify($jsFileContents); JSMin::minify($jsFileContents);
$this->fail('JSMin did not throw exception on minify bad file: '); $this->fail('JSMin did not throw exception on minify bad file: ');
} catch(Exception $e) { } catch(Exception $e) {

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

@ -7,9 +7,15 @@ require_once 'Zend/Locale.php';
require_once 'Zend/Translate/Adapter.php'; require_once 'Zend/Translate/Adapter.php';
// ischommer CUSTOM Check required because SS core also includes the lib, from a different location // 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('sfYaml')) {
if(!class_exists('sfYamlParser')) require_once 'thirdparty/sfYaml/lib/sfYamlParser.php'; require_once __DIR__ .'/thirdparty/sfYaml/lib/sfYaml.php';
if(!class_exists('sfYamlDumper')) require_once 'thirdparty/sfYaml/lib/sfYamlDumper.php'; }
if(!class_exists('sfYamlParser')) {
require_once __DIR__ . '/thirdparty/sfYaml/lib/sfYamlParser.php';
}
if(!class_exists('sfYamlDumper')) {
require_once __DIR__ . '/thirdparty/sfYaml/lib/sfYamlDumper.php';
}
// ischommer END_CUSTOM // ischommer END_CUSTOM
class Translate_Adapter_RailsYaml extends Zend_Translate_Adapter { class Translate_Adapter_RailsYaml extends Zend_Translate_Adapter {