Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 997)
+++ trunk/CHANGELOG	(revision 998)
@@ -11,6 +11,10 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.0 -------------------------------------
+17-June-2009 Ruud Eisinga
+# Bugfix in "droplets/upgrade.php" - wrong parameter order for adding fields.
+	also the query for "normal" upgrades had a typo.
+! Added warning in output_filter that the function will be removed in 2.9
 17-June-2009 Dietrich Roland Pehlke
 # Bugfix in "droplets/upgrade.php" - wrong tablename change to the correct one
 + Add upgrade-script to droplets
Index: trunk/wb/modules/droplets/tool.php
===================================================================
--- trunk/wb/modules/droplets/tool.php	(revision 997)
+++ trunk/wb/modules/droplets/tool.php	(revision 998)
@@ -148,9 +148,5 @@
 	global $database;
 	$query_droplets = $database->query("SELECT name FROM ".TABLE_PREFIX."mod_droplets WHERE name = '$name'");
 	return ($query_droplets->numRows() == 1);
-
-
-
 }
-
 ?>
\ No newline at end of file
Index: trunk/wb/modules/droplets/upgrade.php
===================================================================
--- trunk/wb/modules/droplets/upgrade.php	(revision 997)
+++ trunk/wb/modules/droplets/upgrade.php	(revision 998)
@@ -24,9 +24,9 @@
 	 */
 	
 	if (function_exists('db_add_field')) {
-		db_add_field($table, "admin_edit", "INT NOT NULL default '0'");
-		db_add_field($table, "admin_view", "INT NOT NULL default '0'");
-		db_add_field($table, "show_wysiwyg", "INT NOT NULL default '0'");
+		db_add_field("admin_edit", 'mod_droplets', "INT NOT NULL default '0'");
+		db_add_field("admin_view", 'mod_droplets', "INT NOT NULL default '0'");
+		db_add_field("show_wysiwyg", 'mod_droplets', "INT NOT NULL default '0'");
 	} else {
 		/**
 		 * Not call by the upgrade-script
@@ -35,7 +35,7 @@
 			`admin_edit` INT NOT NULL default '0',
 			`admin_view` INT NOT NULL default '0',
 			`show_wysiwyg` INT NOT NULL default '0'
-			)";
+			)");
 	}
 }
 ?>
\ No newline at end of file
Index: trunk/wb/modules/output_filter/tool.php
===================================================================
--- trunk/wb/modules/output_filter/tool.php	(revision 997)
+++ trunk/wb/modules/output_filter/tool.php	(revision 998)
@@ -27,6 +27,7 @@
 if(!defined('WB_PATH')) die(header('Location: ../index.php'));
 
 // check if module language file exists for the language set by the user (e.g. DE, EN)
+$MOD_MAIL_FILTER['WARNING']	= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
 if(!file_exists(WB_PATH .'/modules/output_filter/languages/'.LANGUAGE .'.php')) {
 	// no module language file exists for the language set by the user, include default module language file EN.php
 	require_once(WB_PATH .'/modules/output_filter/languages/EN.php');
@@ -69,6 +70,7 @@
 	
 	// output the form with values from the database
 	echo '<p>' .$MOD_MAIL_FILTER['HOWTO'] .'</p>';
+	echo $MOD_MAIL_FILTER['WARNING'];
 ?>
 <form name="store_settings" action="<?php echo $_SERVER['REQUEST_URI'];?>" method="post">
 	<table width="98%" cellspacing="0" cellpadding="5px" class="row_a">
Index: trunk/wb/modules/output_filter/languages/NL.php
===================================================================
--- trunk/wb/modules/output_filter/languages/NL.php	(revision 997)
+++ trunk/wb/modules/output_filter/languages/NL.php	(revision 998)
@@ -29,6 +29,7 @@
 // Headings and text outputs
 $MOD_MAIL_FILTER['HEADING']				= 'Beheersinstellingen: Output Filter';
 $MOD_MAIL_FILTER['HOWTO']				= 'Hier kan je de uitvoer filteren met onderstaande opties.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailto links kunnen gecodeerd worden door een Javascript functie. Om van deze optie gebruik te kunnen maken moet je de PHP code <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> in de &lt;head&gt; sectie van het index.php bestand van je template plaatsen. Zonder deze aanpassing zal enkel het @ teken in het mailto deel vervangen worden.</p>';
+$MOD_MAIL_FILTER['WARNING']				= '<p style="color: red; line-height:1.5em;"><strong>Waarschuwing: </strong>Deze functionaliteit is vanaf nu ook beschikbaar als Droplet. De volgende versie van Website Baker (2.9) zal dit filter dan ook niet meer ondersteunen. Gebruik voortaan de <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
 
 // Text and captions of form elements
 $MOD_MAIL_FILTER['BASIC_CONF']			= 'E-mail Configuratie';
Index: trunk/wb/modules/output_filter/languages/EN.php
===================================================================
--- trunk/wb/modules/output_filter/languages/EN.php	(revision 997)
+++ trunk/wb/modules/output_filter/languages/EN.php	(revision 998)
@@ -29,6 +29,7 @@
 // Headings and text outputs
 $MOD_MAIL_FILTER['HEADING']				= 'Options: Output Filter';
 $MOD_MAIL_FILTER['HOWTO']						= 'You can configure the output filtering with the options below.<p style="line-height:1.5em;"><strong>Tip: </strong>Mailto links can be encrypted by a Javascript function. To make use of this option, one needs to add the PHP code <code style="background:#FFA;color:#900;">&lt;?php register_frontend_modfiles(\'js\');?&gt;</code> into the &lt;head&gt; section of the index.php of your template. Without this modification, only the @ character in the mailto part will be replaced.</p>';
+$MOD_MAIL_FILTER['WARNING']						= '<p style="color: red; line-height:1.5em;"><strong>Warning: </strong>This function is now available as a Droplet. The next major release of website baker will not include this filter anymore. Please concider using the <a href="?tool=droplets">Droplet</a> [[EmailFilter]]</p>';
 
 // Text and captions of form elements
 $MOD_MAIL_FILTER['BASIC_CONF']			= 'Basic Email Configuration';