diff --git a/release/src-rt-6.x.4708/router/www/status-devices.asp b/release/src-rt-6.x.4708/router/www/status-devices.asp
index e26c315691..856fafe1b2 100644
--- a/release/src-rt-6.x.4708/router/www/status-devices.asp
+++ b/release/src-rt-6.x.4708/router/www/status-devices.asp
@@ -274,20 +274,20 @@ dg.populate = function() {
var proto = nvram['wan'+k+'_proto'];
if ((proto == 'pppoe' || proto == 'pptp' || proto == 'l2tp') && nvram['wan'+k+'_hwaddr']) {
e = get(nvram['wan'+k+'_hwaddr'], null);
- e.ifname = nvram['wan'+k+'_iface'];
+ e.ifname = (nvram['wan'+k+'_iface'] ? nvram['wan'+k+'_iface'] : (nvram['wan'+k+'_ifname'] ? nvram['wan'+k+'_ifname'] : 'ppp+'));
var face = (nvram['wan'+k+'_ifname'] ? nvram['wan'+k+'_ifname'] : (nvram['wan'+k+'_ifnameX'] ? nvram['wan'+k+'_ifnameX'] : ''));
var ip = nvram['wan'+k+'_ppp_get_ip'];
var gw = nvram['wan'+k+'_gateway_get'];
- if (gw == '0.0.0.0' || gw == '')
+ if ((!gw) || (gw == '0.0.0.0'))
gw = nvram['wan'+k+'_gateway'];
- e.ip = 'r: '+gw+'
l: '+ip;
+ e.ip = 'r: '+gw+(ip && ip != '0.0.0.0' ? '
l: '+ip : '');
var ip2 = nvram['wan'+k+'_ipaddr'];
var gw2 = nvram['wan'+k+'_gateway'];
if (nvram['wan'+k+'_pptp_dhcp'] == '1') {
- if (gw2 != '' && gw2 != '0.0.0.0' && gw2 != gw && ip2 != '' && ip2 != '0.0.0.0' && ip2 != ip) {
+ if (gw2 && gw2 != '0.0.0.0' && gw2 != gw && ip2 && ip2 != '0.0.0.0' && ip2 != ip) {
e.ip = 'r: '+gw+'
l: '+ip;
- e. name = 'r: '+gw2+(face ? ' ('+face+')<\/small>' : '')+'
l: '+ip2+(face ? ' ('+face+')<\/small>' : '');
+ e.name = 'r: '+gw2+(face ? ' ('+face+')<\/small>' : '')+'
l: '+ip2+(face ? ' ('+face+')<\/small>' : '');
}
}
else {