Merged revisions 2681-2739 from 3.0.4 stable branch.

tbrehm

2011-10-21 8ab3cdc09cfbac3157e996664616c229214f6c8d

 interface/web/sites/form/webdav_user.tform.php

@@ -73,10 +73,9 @@
         'datatype'   => 'INTEGER',
         'formtype'   => 'SELECT',
         'default'   => '',
         'datasource'   => array (    'type'   => 'SQL',
                              'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                              'keyfield'=> 'domain_id',
                              'valuefield'=> 'domain'
         'datasource'   => array (    'type'   => 'CUSTOM',
                              'class'=> 'custom_datasource',
                              'function'=> 'webdav_domains'
                            ),
         'value'      => ''
      ),