Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/steps/settings/identities.inc

@@ -33,11 +33,7 @@
  if (!$attrib['id'])
    $attrib['id'] = 'rcmIdentityFrame';

  $attrib['name'] = $attrib['id'];

  $OUTPUT->set_env('contentframe', $attrib['name']);

  return html::iframe($attrib);
  return $OUTPUT->frame($attrib, true);
  }

$OUTPUT->add_handler('identityframe', 'rcmail_identity_frame');