mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #6374 from dhensby/pulls/3.5/no-exception-on-requirements-failure
Revert Requirements throwing exceptions from #5260
This commit is contained in:
commit
0d20ec1e10
@ -1359,8 +1359,6 @@ class Requirements_Backend {
|
|||||||
$this->css($theme . $css, $media);
|
$this->css($theme . $css, $media);
|
||||||
} elseif($module) {
|
} elseif($module) {
|
||||||
$this->css($module . $css, $media);
|
$this->css($module . $css, $media);
|
||||||
} else {
|
|
||||||
throw new InvalidArgumentException("The css file doesn't exists. Please check if the file $name.css exists in any context or search for themedCSS references calling this file in your templates.");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1393,8 +1391,6 @@ class Requirements_Backend {
|
|||||||
$this->javascript($theme . $js);
|
$this->javascript($theme . $js);
|
||||||
} elseif($module) {
|
} elseif($module) {
|
||||||
$this->javascript($module . $js);
|
$this->javascript($module . $js);
|
||||||
} else {
|
|
||||||
throw new InvalidArgumentException("The javascript file doesn't exists. Please check if the file $name.js exists in any context or search for themedJavascript references calling this file in your templates.");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user