diff --git a/mod/embed/languages/en.php b/mod/embed/languages/en.php
index cabe977cf91..b36ccaa90a2 100644
--- a/mod/embed/languages/en.php
+++ b/mod/embed/languages/en.php
@@ -2,4 +2,5 @@
return array(
'embed:embed' => 'Embed',
'embed:media' => 'Embed content',
+ 'embed:no_support' => 'There is no embeddable content available',
);
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 08ffaff5838..475d17351d0 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -6,7 +6,7 @@
3.0
bundled
enhancement
- Allows users to easily upload and embed media into text areas. Requires a plugin for uploading files.
+ Allows users to easily upload and embed media into text areas.
http://www.elgg.org/
See COPYRIGHT.txt
GNU General Public License version 2
@@ -14,9 +14,5 @@
elgg_release
3.0
-
- plugin
- file_uploading
-
true
diff --git a/mod/embed/views/default/embed/layout.php b/mod/embed/views/default/embed/layout.php
index 275ab10a9b1..8f2e67bfe01 100644
--- a/mod/embed/views/default/embed/layout.php
+++ b/mod/embed/views/default/embed/layout.php
@@ -8,6 +8,11 @@
$menu = elgg_view_menu('embed', $vars);
$selected = elgg_get_config('embed_tab');
+if (empty($selected)) {
+ echo elgg_view('output/longtext', ['value' => elgg_echo('embed:no_support')]);
+ return;
+}
+
if ($selected->getData('view')) {
$tab = elgg_view($selected->getData('view'), $vars);
} else {
@@ -25,11 +30,4 @@
'value' => elgg_get_page_owner_guid(),
]);
-echo <<
- $title
- $menu
- $tab
- $container_info
-
-HTML;
+echo elgg_format_element('div', ['class' => 'embed-wrapper'], $title . $menu . $tab . $container_info);
diff --git a/mod/embed/views/default/navigation/menu/embed.php b/mod/embed/views/default/navigation/menu/embed.php
index 96370f3beed..4f3881d64b3 100644
--- a/mod/embed/views/default/navigation/menu/embed.php
+++ b/mod/embed/views/default/navigation/menu/embed.php
@@ -5,8 +5,20 @@
* @uses $vars['menu']['default']
*/
+use Elgg\Collections\Collection;
+
$tabs = [];
-foreach ($vars['menu']['default'] as $menu_item) {
+
+$menu = elgg_extract('menu', $vars);
+if (!$menu instanceof Collection) {
+ return;
+}
+
+if (empty($menu->count())) {
+ return;
+}
+
+foreach ($menu['default'] as $menu_item) {
$tabs[] = [
'text' => $menu_item->getText(),
'href' => 'embed/' . $menu_item->getName(),