diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
| commit | bb3c9a26bb75c76c5934d327548bf08606467b9f (patch) | |
| tree | 26760aa866799fc70683ef6845bf54fb17bdc955 /mod/tinymce/views/default/js/tinymce.php | |
| parent | 2feedf39f6484879333a7b77fdc3c184150db8c7 (diff) | |
| parent | 398572fd96c72b363fd5a252fb9cbe1cecab1e04 (diff) | |
| download | elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.gz elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.bz2 | |
Merge branch 'floxglove-3' into saravea
Conflicts:
.gitmodules
Diffstat (limited to 'mod/tinymce/views/default/js/tinymce.php')
| -rw-r--r-- | mod/tinymce/views/default/js/tinymce.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php index 51e99c223..b4db43cee 100644 --- a/mod/tinymce/views/default/js/tinymce.php +++ b/mod/tinymce/views/default/js/tinymce.php @@ -39,7 +39,7 @@ elgg.tinymce.init = function() { editor_selector : "elgg-input-longtext", theme : "advanced", language : "<?php echo tinymce_get_site_language(); ?>", - plugins : "lists,spellchecker,autosave,fullscreen,paste", + plugins : "lists,spellchecker,autosave,fullscreen,paste,inlinepopups", relative_urls : false, remove_script_host : false, document_base_url : elgg.config.wwwroot, |