mirror of https://github.com/MISP/MISP
parent
b4711463f8
commit
dad39083cf
|
@ -19,14 +19,17 @@
|
|||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
*/
|
||||
|
||||
// @codingStandardsIgnoreStart
|
||||
|
||||
/*
|
||||
*
|
||||
* Using the Schema command line utility
|
||||
* cake schema run create i18n
|
||||
*
|
||||
*/
|
||||
class i18nSchema extends CakeSchema {
|
||||
|
||||
// @codingStandardsIgnoreEnd
|
||||
|
||||
public $name = 'i18n';
|
||||
|
||||
public function before($event = array()) {
|
||||
|
|
|
@ -1,14 +1,20 @@
|
|||
81c81,83
|
||||
< if (is_dir($path)) {
|
||||
---
|
||||
> // deresz: commented out for compatibility with NCIRC PHP security settings (open_basedir restriction)
|
||||
>
|
||||
> // if (is_dir($path)) {
|
||||
83,85c85,87
|
||||
< } else {
|
||||
< $path = APP . $path . $id;
|
||||
< }
|
||||
---
|
||||
> // } else {
|
||||
> // $path = APP . $path . $id;
|
||||
> // }
|
||||
--- lib/Cake/View/MediaView.php.orig 2012-12-12 16:45:24.269525098 +0100
|
||||
+++ lib/Cake/View/MediaView.php 2012-12-12 16:46:32.173528779 +0100
|
||||
@@ -78,11 +78,13 @@
|
||||
$name = $download = $extension = $id = $modified = $path = $cache = $mimeType = $compress = null;
|
||||
extract($this->viewVars, EXTR_OVERWRITE);
|
||||
|
||||
- if (is_dir($path)) {
|
||||
+ // deresz: commented out for compatibility with NCIRC PHP security settings (open_basedir restriction)
|
||||
+
|
||||
+ //if (is_dir($path)) {
|
||||
$path = $path . $id;
|
||||
- } else {
|
||||
- $path = APP . $path . $id;
|
||||
- }
|
||||
+ //} else {
|
||||
+ // $path = APP . $path . $id;
|
||||
+ //}
|
||||
|
||||
if (!is_file($path)) {
|
||||
if (Configure::read('debug')) {
|
||||
|
|
Loading…
Reference in New Issue