reverted r39642 for a better solution to come

This commit is contained in:
Christian Binder 2012-07-02 20:43:00 +00:00
parent ef0cc4f6bd
commit c900737797

View File

@ -80,22 +80,6 @@ abstract class bo_merge
* Parse HTML styles into target document style, if possible * Parse HTML styles into target document style, if possible
*/ */
protected $parse_html_styles = true; protected $parse_html_styles = true;
/**
* Apps which currently support merge
*
* @var array $merge_apps (array appname => human-readable name)
*
*/
public static $merge_apps = array(
'addressbook' => 'Addressbook',
'calendar' => 'Calendar',
'filemanager' => 'Filemanager',
'infolog' => 'Infolog',
'projectmanager' => 'Projectmanager',
'timesheet' => 'Timesheet',
'tracker' => 'Tracker',
);
/** /**
* Constructor * Constructor