From: Manuel Munz <freifunk@somakoma.de>
Date: Wed, 2 Nov 2011 10:35:03 +0000 (+0000)
Subject: luci-0.10: Merge r7866
X-Git-Tag: 0.10.0~54
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7d121d1573d770b1f203066538ed8a2cd4f22f1e;p=oweals%2Fluci.git

luci-0.10: Merge r7866
---

diff --git a/modules/freifunk/luasrc/view/freifunk/adminindex.htm b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
index 4eed2aa95..4fcc16ccd 100644
--- a/modules/freifunk/luasrc/view/freifunk/adminindex.htm
+++ b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
@@ -8,6 +8,15 @@ local latitude = uci:get_first ("system", "system", "latitude")
 local longitude = uci:get_first ("system", "system", "longitude")
 local location = uci:get_first ("system", "system", "location")
 local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics")
+local nickname, name, mail
+if not contact then
+	nickname, name, mail = ""
+else
+	nickname = contact.nickname
+	name = contact.name
+	mail = contact.mail
+end
+
 luci.i18n.loadc("freifunk")
 %>
 
@@ -23,7 +32,7 @@ luci.i18n.loadc("freifunk")
 <%end%>
 <p />
 
-<% if not (contact.nickname and contact.name and contact.mail) then%>
+<% if not (nickname and name and mail) then%>
 <div class="error">
 	<%:Contact information is incomplete. Please go to%> <a href='<%=contacturl%>'><%:Contact%></a> <%:and fill out all required fields.%>
 	<p />