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

Merge pull request #7974 from JakubOnderka/url-cache 

fix: [internal] Remove UrlCache
pull/7984/head
Jakub Onderka 2021-11-22 15:59:59 +01:00 committed by GitHub
parent c431234d95 0a941bd7f3
commit 741a74165e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/bootstrap.default.php
View File

@ -132,7 +132,6 @@ if (Configure::read('MISP.baseurl')) {
CakePlugin::load('SysLog'); CakePlugin::load('SysLog');
CakePlugin::load('Assets'); // having Logable CakePlugin::load('Assets'); // having Logable
CakePlugin::load('SysLogLogable'); CakePlugin::load('SysLogLogable');
CakePlugin::load('UrlCache');
/** /**
* Uncomment the following line to enable client SSL certificate authentication. * Uncomment the following line to enable client SSL certificate authentication.

1
app/Plugin/UrlCache/keep.txt Normal file
View File

@ -0,0 +1 @@
This plugin is not used anymore, but it is here to keep backward compatibility.

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

@ -20,9 +20,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('UrlCacheAppHelper', 'UrlCache.View/Helper'); App::uses('Helper', 'View');
/** /**
* Application helper * Application helper
@ -32,16 +30,13 @@ App::uses('UrlCacheAppHelper', 'UrlCache.View/Helper');
* *
* @package app.View.Helper * @package app.View.Helper
*/ */
class AppHelper extends UrlCacheAppHelper { class AppHelper extends Helper
{
public function afterLayout($layoutFile) { public function url($url = null, $full = false)
} {
public function url($url = null, $full = false) {
if (is_array($url) && !isset($url['admin'])) { if (is_array($url) && !isset($url['admin'])) {
$url['admin'] = false; $url['admin'] = false;
} }
return parent::url($url, $full); return parent::url($url, $full);
} }
} }

1
travis/bootstrap.php
View File

@ -106,7 +106,6 @@ if (!Configure::read('MISP.baseurl')) {
CakePlugin::load('SysLog'); CakePlugin::load('SysLog');
CakePlugin::load('Assets'); // having Logable CakePlugin::load('Assets'); // having Logable
CakePlugin::load('SysLogLogable'); CakePlugin::load('SysLogLogable');
CakePlugin::load('UrlCache');
/** /**
* Uncomment the following line to enable client SSL certificate authentication. * Uncomment the following line to enable client SSL certificate authentication.