From 053673cb71a45a38a2eb517c4e630656a5626327 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 15 Jan 2017 17:50:16 +0100 Subject: [PATCH] Remove CSS call for addlink toolbar plugin Fixes #724 --- plugins/addlink_toolbar/addlink_toolbar.php | 16 --------- tests/plugins/PluginAddlinkTest.php | 40 --------------------- 2 files changed, 56 deletions(-) diff --git a/plugins/addlink_toolbar/addlink_toolbar.php b/plugins/addlink_toolbar/addlink_toolbar.php index bf8a198a..ddf50aaf 100644 --- a/plugins/addlink_toolbar/addlink_toolbar.php +++ b/plugins/addlink_toolbar/addlink_toolbar.php @@ -40,19 +40,3 @@ function hook_addlink_toolbar_render_header($data) return $data; } - -/** - * When link list is displayed, include markdown CSS. - * - * @param array $data - includes data. - * - * @return mixed - includes data with markdown CSS file added. - */ -function hook_addlink_toolbar_render_includes($data) -{ - if ($data['_PAGE_'] == Router::$PAGE_LINKLIST && $data['_LOGGEDIN_'] === true) { - $data['css_files'][] = PluginManager::$PLUGINS_PATH . '/addlink_toolbar/addlink_toolbar.css'; - } - - return $data; -} diff --git a/tests/plugins/PluginAddlinkTest.php b/tests/plugins/PluginAddlinkTest.php index b77fe12a..b6239e7f 100644 --- a/tests/plugins/PluginAddlinkTest.php +++ b/tests/plugins/PluginAddlinkTest.php @@ -57,44 +57,4 @@ class PluginAddlinkTest extends PHPUnit_Framework_TestCase $this->assertEquals($str, $data[$str]); $this->assertArrayNotHasKey('fields_toolbar', $data); } - - /** - * Test render_includes hook while logged in. - */ - public function testAddlinkIncludesLoggedIn() - { - $str = 'stuff'; - $data = array($str => $str); - $data['_PAGE_'] = Router::$PAGE_LINKLIST; - $data['_LOGGEDIN_'] = true; - - $data = hook_addlink_toolbar_render_includes($data); - $this->assertEquals($str, $data[$str]); - $this->assertEquals(1, count($data['css_files'])); - - $str = 'stuff'; - $data = array($str => $str); - $data['_PAGE_'] = $str; - $data['_LOGGEDIN_'] = true; - - $data = hook_addlink_toolbar_render_includes($data); - $this->assertEquals($str, $data[$str]); - $this->assertArrayNotHasKey('css_files', $data); - } - - /** - * Test render_includes hook. - * Should not affect css files while logged out. - */ - public function testAddlinkIncludesLoggedOut() - { - $str = 'stuff'; - $data = array($str => $str); - $data['_PAGE_'] = Router::$PAGE_LINKLIST; - $data['_LOGGEDIN_'] = false; - - $data = hook_addlink_toolbar_render_includes($data); - $this->assertEquals($str, $data[$str]); - $this->assertArrayNotHasKey('css_files', $data); - } } -- 2.41.0