diff --git a/app/Config/bootstrap.default.php b/app/Config/bootstrap.default.php index 310a533e1..13fb9d28a 100644 --- a/app/Config/bootstrap.default.php +++ b/app/Config/bootstrap.default.php @@ -132,7 +132,6 @@ if (Configure::read('MISP.baseurl')) { CakePlugin::load('SysLog'); CakePlugin::load('Assets'); // having Logable CakePlugin::load('SysLogLogable'); -CakePlugin::load('UrlCache'); /** * Uncomment the following line to enable client SSL certificate authentication. diff --git a/app/Plugin/UrlCache/keep.txt b/app/Plugin/UrlCache/keep.txt new file mode 100644 index 000000000..2f798dbe5 --- /dev/null +++ b/app/Plugin/UrlCache/keep.txt @@ -0,0 +1 @@ +This plugin is not used anymore, but it is here to keep backward compatibility. diff --git a/app/View/Helper/AppHelper.php b/app/View/Helper/AppHelper.php index 4841ce742..e026f8473 100644 --- a/app/View/Helper/AppHelper.php +++ b/app/View/Helper/AppHelper.php @@ -20,9 +20,7 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::uses('UrlCacheAppHelper', 'UrlCache.View/Helper'); - - +App::uses('Helper', 'View'); /** * Application helper @@ -32,16 +30,13 @@ App::uses('UrlCacheAppHelper', 'UrlCache.View/Helper'); * * @package app.View.Helper */ -class AppHelper extends UrlCacheAppHelper { - - public function afterLayout($layoutFile) { - } - - public function url($url = null, $full = false) { +class AppHelper extends Helper +{ + public function url($url = null, $full = false) + { if (is_array($url) && !isset($url['admin'])) { $url['admin'] = false; } return parent::url($url, $full); - } } diff --git a/travis/bootstrap.php b/travis/bootstrap.php index 630c53205..ec050e512 100644 --- a/travis/bootstrap.php +++ b/travis/bootstrap.php @@ -106,7 +106,6 @@ if (!Configure::read('MISP.baseurl')) { CakePlugin::load('SysLog'); CakePlugin::load('Assets'); // having Logable CakePlugin::load('SysLogLogable'); -CakePlugin::load('UrlCache'); /** * Uncomment the following line to enable client SSL certificate authentication.