Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-17 8f098e8dead85b6512ac72b2d805314baec72a2f

 program/steps/addressbook/edit.inc

@@ -117,9 +117,6 @@

    $record = rcmail_get_edit_record();

    // add some labels to client
    $RCMAIL->output->add_label('noemailwarning', 'nonamewarning');

    // copy (parsed) address template to client
    if (preg_match_all('/\{([a-z0-9]+)\}([^{]*)/i', $RCMAIL->config->get('address_template', ''), $templ, PREG_SET_ORDER))
      $RCMAIL->output->set_env('address_template', $templ);