- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_ove...

alecpl

2012-01-01 bc8437b71c440a605497a6af363811351b1aa147

- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'
- Fix wrong (long) label usage (#1488283)
- Fix handling of INBOX's subfolders in special folders config (#1488279)
- Add ifModule statement for setting Options -Indexes in .htaccess file (#1488274)

 program/steps/mail/compose.inc

@@ -1259,7 +1259,7 @@

function rcmail_compose_attachment_form($attrib)
{
  global $RCMAIL, $OUTPUT;
  global $OUTPUT;

  // add ID if not given
  if (!$attrib['id'])
@@ -1380,8 +1380,6 @@

function rcmail_editor_selector($attrib)
{
  global $CONFIG, $MESSAGE, $compose_mode;

  // determine whether HTML or plain text should be checked
  $useHtml = rcmail_compose_editor_mode();


 skins/default/templates/compose.html

@@ -112,10 +112,12 @@
            </div>
            <div id="compose-editorfooter">
                <span id="spellcheck-control" style="margin-right:10px"></span>
                <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
                <span>
                    <label><roundcube:label name="editortype" /></label>
                    <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
                </span>
                <roundcube:endif />
            </div>
        </div>
    </div>