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

Merge branch 'master' into develop

pull/63/head
noud 2012-09-25 16:20:15 +02:00
parent ec0892a6ad f62dbfd595
commit 0d1cb464b5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/View/Helper/AppHelper.php
View File

@ -31,8 +31,9 @@ App::uses('Helper', 'View');
* @package app.View.Helper
*/
class AppHelper extends Helper {
function url($url = null, $full = false) {
if(is_array($url) && !isset($url['admin'])){
public function url($url = null, $full = false) {
if (is_array($url) && !isset($url['admin'])) {
$url['admin'] = false;
}
return parent::url($url, $full);

7
build/patches/app_View_Helper_AppHelper.php.diff
View File

@ -1,11 +1,12 @@
--- app/View/Helper/AppHelper.php.orig 2012-09-20 15:32:09.844653514 +0200
+++ app/View/Helper/AppHelper.php 2012-09-06 13:45:12.791544951 +0200
@@ -31,4 +31,10 @@
@@ -31,4 +31,11 @@
* @package app.View.Helper
*/
class AppHelper extends Helper {
+ function url($url = null, $full = false) {
+ if(is_array($url) && !isset($url['admin'])){
+
+ public function url($url = null, $full = false) {
+ if (is_array($url) && !isset($url['admin'])) {
+ $url['admin'] = false;
+ }
+ return parent::url($url, $full);