diff options
| author | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
|---|---|---|
| committer | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
| commit | ae8e971eef2be269beab9465139869055918d878 (patch) | |
| tree | 5314a2d5b494884271d8900cba6afc348952279b /applications/luci-app-olsr-services | |
| parent | 4742d1c2112ace9d1299c69fb086c1646bb04911 (diff) | |
| parent | 36879e9e8658601dc3e86ff9251da3fc3666efe0 (diff) | |
Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes
Diffstat (limited to 'applications/luci-app-olsr-services')
| -rw-r--r-- | applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm index 7142c77b39..0e59c61258 100644 --- a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm +++ b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm @@ -93,9 +93,9 @@ if luci.http.formvalue("status") == "1" then local rv = {} for k, line in ipairs(services) do local field = utl.split(line, "[#|]", split, true) - local origin_lnk = ip.IPv6(pcdata(field[4])) or "" + local origin_lnk = ip.IPv6(pcdata(field[4])) local origin_link = "" - if #origin_lnk ~= 0 and origin_lnk:is6() then + if origin_lnk and origin_lnk:is6() then origin_link = "["..origin_lnk:string().."]" else origin_link = pcdata(field[4]) @@ -168,9 +168,9 @@ end local field = {} -- split line at # and |, 1=url, 2=proto, 3=description, 4=source local field = utl.split(line, "[#|]", split, true) - local origin_lnk = ip.IPv6(pcdata(field[4])) or "" + local origin_lnk = ip.IPv6(pcdata(field[4])) local origin_link - if #origin_lnk ~= 0 and origin_lnk:is6() then + if origin_lnk and origin_lnk:is6() then origin_link = "["..origin_lnk:string().."]" else origin_link = pcdata(field[4]) |