r1368 - xwiki/trunk/src/main/java/com/xpn/xwiki

[Ludovic Dubost]

Author: ludovic
Date: 2006-10-06 10:47:09 +0200 (Fri, 06 Oct 2006)
New Revision: 1368

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
Log:
Fix new getWebPreference API

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-10-06 07:55:33 UTC (rev 1367)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-10-06 08:47:09 UTC (rev 1368)
@@ -1284,7 +1284,7 @@
 
     public String getWebPreference(String prefname, String default_value, XWikiContext context) {
         XWikiDocument currentdoc = (XWikiDocument) context.get("doc");
-        return getWebPreference(prefname, currentdoc.getWeb(), default_value, context);
+        return getWebPreference(prefname, (currentdoc==null) ? null : currentdoc.getWeb(), default_value, context);
     }
 
     public String getWebPreference(String prefname, String space, String default_value, XWikiContext context) {