From b86d6d3f875bea7bf3e134678af8572445f42740 Mon Sep 17 00:00:00 2001 From: cdujeu Date: Wed, 3 Sep 2014 11:04:34 +0200 Subject: [PATCH] SMPlayer canvas overlays button. Left it open. Cross direct download links with minisite rights --- core/src/plugins/action.share/class.ShareCenter.php | 2 +- core/src/plugins/action.share/manifest.xml | 4 ++-- core/src/plugins/editor.soundmanager/sm_preview_player.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php index f088f30a76..b2bf0bfd49 100644 --- a/core/src/plugins/action.share/class.ShareCenter.php +++ b/core/src/plugins/action.share/class.ShareCenter.php @@ -1000,7 +1000,7 @@ public static function loadMinisite($data, $hash = '') $_SESSION["CURRENT_MINISITE"] = $hash; } - if(isSet($_GET["dl"]) && isSet($_GET["file"])){ + if(isSet($_GET["dl"]) && isSet($_GET["file"]) && (!isSet($data["DOWNLOAD_DISABLED"]) || $data["DOWNLOAD_DISABLED"] === false)){ ConfService::switchRootDir($repository); ConfService::loadRepositoryDriver(); AJXP_PluginsService::deferBuildingRegistry(); diff --git a/core/src/plugins/action.share/manifest.xml b/core/src/plugins/action.share/manifest.xml index 3d217fcf3d..9c9370d163 100644 --- a/core/src/plugins/action.share/manifest.xml +++ b/core/src/plugins/action.share/manifest.xml @@ -475,11 +475,11 @@ #{title} '); var node = ajaxplorer.getContextHolder().getUniqueNode(); var editors = ajaxplorer.findEditorsForMime(node.getAjxpMime(), true); - if(editors.length){ + if(editors.length && Class.getByName(editors[0].editorClass)){ var staticClass = Class.getByName(editors[0].editorClass).prototype; if(staticClass.getRESTPreviewLinks){ var links = staticClass.getRESTPreviewLinks(node); diff --git a/core/src/plugins/editor.soundmanager/sm_preview_player.css b/core/src/plugins/editor.soundmanager/sm_preview_player.css index 6d5807172f..478643e643 100644 --- a/core/src/plugins/editor.soundmanager/sm_preview_player.css +++ b/core/src/plugins/editor.soundmanager/sm_preview_player.css @@ -28,7 +28,7 @@ } .ui360-vis.ui360-vis-retracted, .ui360-vis.ui360-vis-retracted .sm2-360ui, .sm2-inline-list .ui360-vis.ui360-vis-retracted { - height: 100px; + /*height: 100px;*/ } .ui360-micro{