cvs commit: jahia/core/src/java/org/jahia/params ParamBean.java

[Marc Cardle]

mcardle     2005/08/24 14:47:05 CEST

  Modified files:
    core/src/java/org/jahia/params ParamBean.java 
  Log:
  doesn't display esi URL param when ESI isn't active
  
  Revision  Changes    Path
  1.30      +5 -1      jahia/core/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ParamBean.java.diff?r1=1.29&r2=1.30&f=h
  
  
  
  Index: ParamBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- ParamBean.java    23 Aug 2005 16:58:29 -0000      1.29
  +++ ParamBean.java    24 Aug 2005 12:47:05 -0000      1.30
  @@ -1814,6 +1814,10 @@
        */
      private String getESITemplParam(int pageID) {
   
  +        //ESI isn't active so ignore the ESI param
  +        if (!settings().lookupBoolean(SettingsBean.ESI_CACHE_ACTIVATED))
  +            return "";
  +
          StringBuffer result = new StringBuffer();
   
          //-get user ESI key  (user either Marc's JahiaUserDB.getUserESIKey or 
existing JahiaUSer.hashCode() )
  @@ -1866,7 +1870,7 @@
              e.printStackTrace();
          }*/
   
  -       //if ESIuser set, then add to result
  +          //if ESIuser set, then add to result
             if ( !INDIV_ESI.equals(ESIuser) ) {
                  //result.append("/user/");
                  //result.append(ESIuserVal);