Merge branch 'master' from http://gitweb.pfsense.org/pfsense/pfsense-gettext.git

3 files changed, 5 insertions, 4 deletions

diff --git a/etc/rc.bootup b/etc/rc.bootup
index 6d4c3a5..0cd201a 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -107,9 +107,9 @@ require_once("/etc/inc/auth.inc");
 echo ".";
 require_once("/etc/inc/functions.inc");
 echo ".";
-require("/etc/inc/filter.inc");
+require_once("/etc/inc/filter.inc");
 echo ".";
-require("/etc/inc/shaper.inc");
+require_once("/etc/inc/shaper.inc");
 echo ".";
 require_once("/etc/inc/ipsec.inc");
 echo ".";
diff --git a/usr/local/www/pkg_mgr_settings.php b/usr/local/www/pkg_mgr_settings.php
index c3d0ce5..27c19da 100644
--- a/usr/local/www/pkg_mgr_settings.php
+++ b/usr/local/www/pkg_mgr_settings.php
@@ -109,7 +109,7 @@ function enable_altpkgrepourl(enable_over) {
 			<tr><td><?=gettext("Base URL:");?></td><td><input name="pkgrepourl" type="input" class="formfld url" id="pkgrepourl" size="64" value="<?php if($curcfg['xmlrpcbaseurl']) echo $curcfg['xmlrpcbaseurl']; else echo $g['']; ?>"></td></tr>
 			</table>
 			<span class="vexpl">
-				<?=printf(gettext("This is where %s will check for packages when the"),$g['product_name']);?>, <a href="pkg_mgr.php"><?=gettext("System: Packages");?></a> <?=gettext("page is viewed");?>.
+				<?php printf(gettext("This is where %s will check for packages when the"),$g['product_name']);?>, <a href="pkg_mgr.php"><?=gettext("System: Packages");?></a> <?=gettext("page is viewed.");?>
 				</span>
 				</td>
 	</tr>
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index 9f2e97e..ee3e13c 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -74,8 +74,9 @@ if ($_POST) {
 
 		$config['ipsec']['enable'] = $_POST['enable'] ? true : false;
 
-		$retval = vpn_ipsec_configure();
 		write_config();
+
+		$retval = vpn_ipsec_configure();
 	}
 }