Merge remote-tracking branch 'origin/next' into fifteen

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index c6e20a0e6f5592ebd7ca0385a42842d61d563dcd..3c5280330bdad079042b351ea7f3b27542012336 100644 (file)
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -446,7 +446,7 @@ sub showEditBox() {
                        <table width='100%'>
                                <tr>
                                        <td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td>
-                                       <td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td>
+                                       <td width='40%'><input type='text' name='SSID' value="$settings{'SSID'}" size='25'/></td>
                                        <td class='base' width='10%'>$Lang::tr{'enabled'}</td>
                                        <td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
                                </tr>
@@ -464,7 +464,7 @@ sub showEditBox() {
                                </tr>
                                <tr>
                                        <td class='base' width='20%'>$Lang::tr{'wlan client psk'}:&nbsp;</td>
-                                       <td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td>
+                                       <td width='40%'><input type='password' name='PSK' value="$settings{'PSK'}" size='25'/></td>
                                        <td colspan="2" width='40%'></td>
                                </tr>
                        </table>

diff --git a/make.sh b/make.sh
index 9bae8a679f0f0c661a11029e3654f4d9ca3a51b3..9619ad33b562730b96b6c1ed38c88556f4705973 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
 CORE="73"                                                      # Core Level (Filename)
-PAKFIRE_CORE="72"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="73"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir