MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

CakePHP 

CakePHP update from 2.2.3 to 2.2.4
pull/61/head
noud 2012-12-12 16:51:02 +01:00
parent b4711463f8
commit dad39083cf
3 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Config/Schema/i18n.php
View File

@ -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()) {

34
build/patches/lib_Cake_View_MediaView.php.diff
View File

@ -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')) {