diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php index 63ef85a4..1b55f84c 100644 --- a/include/admin/images.inc.php +++ b/include/admin/images.inc.php @@ -18,12 +18,6 @@ switch ($serendipity['GET']['adminAction']) { case 'imgedit': $data['case_imgedit'] = true; - if (!isset($serendipity['eyecandy']) || serendipity_db_bool($serendipity['eyecandy'])) { - // what?? - } else { - return true; - } - include_once(S9Y_INCLUDE_PATH . "include/functions_images_crop.inc.php"); $media['is_imgedit'] = true; $media['css_imgedit'] = serendipity_getTemplateFile('admin/imgedit.css'); diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php index a8855948..81057c85 100644 --- a/include/admin/plugins.inc.php +++ b/include/admin/plugins.inc.php @@ -381,12 +381,8 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) { $data['save'] = true; $data['timestamp'] = serendipity_strftime('%H:%M:%S'); } - - if (!isset($serendipity['eyecandy']) || serendipity_db_bool($serendipity['eyecandy'])) { - $data['eyecandy'] = true; - } - - serendipity_plugin_api::hook_event("backend_pluginlisting_header" ,$eyecandy); + + serendipity_plugin_api::hook_event("backend_pluginlisting_header", $null); ob_start(); serendipity_plugin_api::hook_event('backend_plugins_sidebar_header', $serendipity); diff --git a/include/functions_plugins_admin.inc.php b/include/functions_plugins_admin.inc.php index e72e5f46..0835ed38 100644 --- a/include/functions_plugins_admin.inc.php +++ b/include/functions_plugins_admin.inc.php @@ -90,14 +90,11 @@ function show_plugins($event_only = false, $sidebars = null) } } - $eyecandy = !isset($serendipity['eyecandy']) || serendipity_db_bool($serendipity['eyecandy']); + $data['event_only'] = $event_only; - $data['eyecandy'] = $eyecandy; - if (!$eyecandy) { - $data['eyecandy'] = false; - } elseif (!$event_only) { + if (!$event_only) { $data['event_only'] = false; - $data['is_first'] = $is_first = true; + $data['is_first'] = true; } $data['serendipity_setFormToken'] = serendipity_setFormToken(); diff --git a/include/tpl/config_personal.inc.php b/include/tpl/config_personal.inc.php index 3efce450..dd5c29a1 100644 --- a/include/tpl/config_personal.inc.php +++ b/include/tpl/config_personal.inc.php @@ -77,14 +77,6 @@ 'permission' => 'personalConfiguration', 'flags' => array('config')), - array('var' => 'eyecandy', - 'title' => PREFERENCE_USE_JS, - 'description' => PREFERENCE_USE_JS_DESC, - 'type' => 'bool', - 'default' => true, - 'permission' => 'personalConfiguration', - 'flags' => array('config')), - array('var' => 'mail_comments', 'title' => USERCONF_SENDCOMMENTS, 'description' => USERCONF_SENDCOMMENTS_DESC, diff --git a/templates/2k11/admin/plugins.inc.tpl b/templates/2k11/admin/plugins.inc.tpl index 2a3e1af8..a4a5b3ff 100644 --- a/templates/2k11/admin/plugins.inc.tpl +++ b/templates/2k11/admin/plugins.inc.tpl @@ -117,11 +117,9 @@ {$CONST.DONE}:{$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"} {/if}

{$CONST.BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS}

- {if $eyecandy} - {/if}

{$CONST.SIDEBAR_PLUGINS}

diff --git a/templates/2k11/admin/show_plugins.fnc.tpl b/templates/2k11/admin/show_plugins.fnc.tpl index 293f930b..7815fc96 100644 --- a/templates/2k11/admin/show_plugins.fnc.tpl +++ b/templates/2k11/admin/show_plugins.fnc.tpl @@ -1,9 +1,7 @@ {* functions_plugins_admin.inc.php::function_show_plugins() including output of functions_plugins_admin.inc.php::function ownership() *} -{if !$eyecandy} -
-{elseif !$event_only} +{if !$event_only} {else} @@ -65,7 +63,7 @@ {/if} - {($eyecandy) ? '