Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files
index 1e46cb98f779504d0865b7c2c077e1dbd7567b7c..024bd72160f4ce5d95fb697630f5fe55c876ca97 100644 (file)
--- a/config/rootfiles/core/37/filelists/files
+++ b/config/rootfiles/core/37/filelists/files
@@ -8,3 +8,4 @@ lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko
 lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko
 lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko
 srv/web/ipfire/cgi-bin/urlfilter.cgi
+srv/web/ipfire/cgi-bin/outgoingfw.cgi
\ No newline at end of file

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index f112f6efc24e2112570b240c6ad3417b8fbf242b..c5db16bab27d375dbad00968ced07dbf2fe7bd94 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -667,7 +667,7 @@ END
                        <td width='30%' align='left'><select name='LOG'>
                                                                                <option value='$Lang::tr{'active'}' $selected{'LOG'}{$Lang::tr{'active'}}>$Lang::tr{'active'}</option>
                                                                                <option value='$Lang::tr{'inactive'}' $selected{'LOG'}{$Lang::tr{'inactive'}}>$Lang::tr{'inactive'}</option>
-                                                                               </select></td>";
+                                                                               </select></td>
                    <td width='20%' align='right' colspan='2' />
                    <td width='30%' align='left' colspan='2' />
                <tr><td width='20%' align='right'>$Lang::tr{'destination ip'}: <img src='/blob.gif' />