Fixed merge problems in mysql_clientdb_plugin.inc.php

tbrehm

2012-01-12 4a8b7ecdf842a6ba7cdf0339067c6ed285cf60cb

 interface/web/admin/server_config_del.php

@@ -44,6 +44,7 @@

//* Check permissions for module
$app->auth->check_module_permissions('admin');
if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');

$app->uses("tform_actions");
$app->tform_actions->onDelete();