Merge branch 'master' of github.com:brettp/Elgg

1 files changed, 19 insertions, 8 deletions

diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index bd61b86ce..2b1462635 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -1,29 +1,40 @@
 <?php
 /**
  * Elgg long text input
- * Displays a long text input field
+ * Displays a long text input field that can use WYSIWYG editor
  *
  * @package Elgg
  * @subpackage Core
  *
- * @uses $vars['value'] The current value, if any - will be html encoded
+ * @uses $vars['value']    The current value, if any - will be html encoded
  * @uses $vars['disabled'] Is the input field disabled?
+ * @uses $vars['class']    Additional CSS class
  */
 
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-longtext {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-longtext";
+}
+
 $defaults = array(
-	'class' => 'elgg-input-longtext',
+	'value' => '',
 	'id' => 'elgg-input-' . rand(), //@todo make this more robust
 );
 
-// work around for deprecation code in elgg_views()
-unset($vars['internalname']);
-unset($vars['internalid']);
-
 $vars = array_merge($defaults, $vars);
 
+$value = $vars['value'];
+unset($vars['value']);
+
 echo elgg_view_menu('longtext', array(
 	'sort_by' => 'priority',
 	'class' => 'elgg-menu-hz',
 	'id' => $vars['id'],
 ));
-echo elgg_view('input/plaintext', $vars);
+
+?>
+
+<textarea <?php echo elgg_format_attributes($vars); ?>>
+<?php echo htmlspecialchars($value, ENT_QUOTES, 'UTF-8', false); ?>
+</textarea>