aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-30 17:09:25 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-30 17:09:25 +0000
commit7d48c5edcc0ee7106fc061d00e0a8678459a7ca5 (patch)
tree8d6aafa0e2b24c1b13f7e0337e38ef37b78b9483 /mod
parentf7d5a61e9b1653719f31abcac013a13789685b40 (diff)
downloadelgg-7d48c5edcc0ee7106fc061d00e0a8678459a7ca5.tar.gz
elgg-7d48c5edcc0ee7106fc061d00e0a8678459a7ca5.tar.bz2
Embed correctly passes text area name to elggEmbedInsertContent().
git-svn-id: http://code.elgg.org/elgg/trunk@6595 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/embed/start.php4
-rw-r--r--mod/embed/views/default/embed/embed.php3
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/embed/start.php b/mod/embed/start.php
index a3b811371..29dc78530 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -53,11 +53,13 @@ function embed_page_handler($page) {
asort($sections, SORT_LOCALE_STRING);
asort($upload_sections, SORT_LOCALE_STRING);
$active_section = get_input('active_section', NULL);
+ $internal_name = get_input('internalname', NULL);
echo elgg_view('embed/embed', array(
'sections' => $sections,
'active_section' => $active_section,
- 'upload_sections' => $upload_sections
+ 'upload_sections' => $upload_sections,
+ 'internal_name' => $internal_name
));
break;
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index e90d28005..250a7a465 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -12,6 +12,7 @@
$sections = elgg_get_array_value('sections', $vars, array());
$active_section = elgg_get_array_value('active_section', $vars, array_shift(array_keys($sections)));
$upload_sections = elgg_get_array_value('upload_sections', $vars, array());
+$internal_name = elgg_get_array_value('internal_name', $vars, array());
if (!$sections) {
$content = elgg_echo('embed:no_sections');
@@ -122,7 +123,7 @@ $(document).ready(function() {
// insert embed codes
$('.embed_data').click(function() {
var embed_code = $(this).data('embed_code');
- elggEmbedInsertContent(embed_code);
+ elggEmbedInsertContent(embed_code, '<?php echo addslashes($internal_name); ?>');
});
// tabs