roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1564004 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
Date Mon, 03 Feb 2014 19:11:57 GMT
Author: ghuber
Date: Mon Feb  3 19:11:56 2014
New Revision: 1564004

URL: http://svn.apache.org/r1564004
Log:
NEP check for themes with no style sheet.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1564004&r1=1564003&r2=1564004&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
Mon Feb  3 19:11:56 2014
@@ -148,8 +148,10 @@ public class ThemeEdit extends UIAction 
                         themeMgr.importTheme(getActionWeblog(), t);
                     } else {
                         // Reset our custom from base
-                        weblog.setCustomStylesheetPath(t.getStylesheet()
-                                .getLink());
+                        if (t.getStylesheet() != null) {
+                            weblog.setCustomStylesheetPath(t.getStylesheet()
+                                    .getLink());
+                        }
                     }
                 } catch (Exception re) {
                     log.error("Error customizing theme for weblog - "



Mime
View raw message