Permalink
Browse files

Replace deprecated functions

Fixes deprecation warnings in Roundcube 1.2
  • Loading branch information...
Disassembler0 committed Mar 5, 2016
1 parent bfa33bf commit 618b0812b6262012fe212b1ed2d6ad18dabd53ad
Showing with 4 additions and 4 deletions.
  1. +3 −3 automatic_addressbook.php
  2. +1 −1 automatic_addressbook_backend.php
@@ -78,7 +78,7 @@ public function address_sources($p)
if ($rcmail->config->get('use_auto_abook', true)) {
$p['sources'][$this->abook_id] =
array('id' => $this->abook_id,
'name' => Q($this->gettext('automaticallycollected')),
'name' => rcube_utils::rep_specialchars_output($this->gettext('automaticallycollected')),
'readonly' => FALSE, 'groups' => false);
}
@@ -214,7 +214,7 @@ public function settings_table($args)
));
$args['blocks']['automaticallycollected']['name'] = $this->gettext('automaticallycollected');
$args['blocks']['automaticallycollected']['options']['use_subscriptions'] = array(
'title' => html::label($field_id, Q($this->gettext('useautoabook'))),
'title' => html::label($field_id, rcube_utils::rep_specialchars_output($this->gettext('useautoabook'))),
'content' => $checkbox->show($use_auto_abook ? 1 : 0),
);
@@ -226,7 +226,7 @@ public function settings_table($args)
));
$args['blocks']['automaticallycollected']['name'] = $this->gettext('automaticallycollected');
$args['blocks']['automaticallycollected']['options']['use_autocompletion'] = array(
'title' => html::label($field_id2, Q($this->gettext('useforcompletion'))),
'title' => html::label($field_id2, rcube_utils::rep_specialchars_output($this->gettext('useforcompletion'))),
'content' => $checkbox2->show($use_auto_abook_for_completion ? 1 : 0),
);
}
@@ -17,6 +17,6 @@ class automatic_addressbook_backend extends rcube_contacts
function __construct($dbconn, $user)
{
parent::__construct($dbconn, $user);
$this->db_name = get_table_name('collected_contacts');
$this->db_name = rcmail::get_instance()->db->table_name('collected_contacts');
}
}

0 comments on commit 618b081

Please sign in to comment.