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

[Ludovic Dubost]

Author: ludovic
Date: 2006-08-10 20:37:37 +0200 (Thu, 10 Aug 2006)
New Revision: 1132

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
Log:
Fixed getting default base skin which still had some "default" hardcoded

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-08-10 18:22:33 UTC (rev 1131)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-08-10 18:37:37 UTC (rev 1132)
@@ -1066,12 +1066,12 @@
                 if (result != null)
                     return result;
             }
-            URL url = urlf.createSkinURL(filename, "default", context);
+            URL url = urlf.createSkinURL(filename, getDefaultBaseSkin(context), context);
             return urlf.getURL(url, context);
         } catch (Exception e) {
         }
 
-        return "../../../skins/default/" + filename;
+        return "../../../skins/" + getDefaultBaseSkin(context) + "/" + filename;
     }
 
     public String getSkinFile(String filename, String skin, XWikiContext context) {
@@ -1143,15 +1143,15 @@
                 skin = getUserPreference("skin", context);
             }
             if (skin.equals("")) {
-                skin = Param("xwiki.defaultskin", "default");
+                skin = Param("xwiki.defaultskin", getDefaultBaseSkin(context));
             }
         } catch (Exception e) {
-            skin = "default";
+            skin = getDefaultBaseSkin(context);
         }
         try {
             if (skin.indexOf(".")!=-1) {
                 if (!checkAccess("view", getDocument(skin, context), context))
-                    skin = Param("xwiki.defaultskin", "default");
+                    skin = Param("xwiki.defaultskin", getDefaultBaseSkin(context));
             }
         } catch (XWikiException e) {
             // if it fails here, let's just ignore it
@@ -1200,7 +1200,7 @@
                 baseskin = getDefaultBaseSkin(context);
             }
         } catch (Exception e) {
-            baseskin = "default";
+            baseskin = getDefaultBaseSkin(context);
         }
         context.put("baseskin", baseskin);
         return baseskin;