diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 8cdd3d45..2b59e028 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -13,6 +13,7 @@ Version ***svn*** - 2009/12/26 - SVN r*** ----------------------------------- + - NOTE: changes from the 2.3 branch also apply to this version - use smarty for templates - new command-line interface for PostfixAdmin (scripts/postfixadmin-cli) diff --git a/DOCUMENTS/DOVECOT.txt b/DOCUMENTS/DOVECOT.txt index c5671e70..41e4a34e 100644 --- a/DOCUMENTS/DOVECOT.txt +++ b/DOCUMENTS/DOVECOT.txt @@ -144,5 +144,3 @@ If you use dovecot 1.2 or newer, - use the 'quota2' table (also created by setup.php) - set $CONF['new_quota_table'] = 'YES' - -*** TODO: Update based on chatlog 2012-05-02 *** diff --git a/model/VacationHandler.php b/model/VacationHandler.php index f746b1bd..6fafb93c 100644 --- a/model/VacationHandler.php +++ b/model/VacationHandler.php @@ -7,7 +7,10 @@ class VacationHandler extends PFAHandler { protected $id_field = 'email'; protected $domain_field = 'domain'; - # init $this->struct, $this->db_table and $this->id_field + function init($id) { + die('VacationHandler is not yet ready to be used with *Handler methods'); # obvious TODO: remove when it's ready ;-) + } + protected function initStruct() { $this->struct=array( # field name allow display in... type $PALANG label $PALANG description default / options / ...