Author: sshyrkov
Date: Wed Jan 16 16:47:54 2008
New Revision: 19528
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19528&repname=
=3Djahia
Log:
[trunk 19508-19518]: 1) removed hardcoded root user ( JAHIA-2689 )
2) removed empty packages
Removed:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/highlighter/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/views/engines=
/savedsearch/
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/media=
gallery/MediaThumbTag.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/mediagallery/MediaThumbTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/mediagallery/MediaThumbTag.jav=
a&rev=3D19528&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/media=
gallery/MediaThumbTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/media=
gallery/MediaThumbTag.java Wed Jan 16 16:47:54 2008
@@ -19,10 +19,11 @@
import org.jahia.bin.Jahia;
import org.jahia.data.JahiaData;
import org.jahia.params.ProcessingContext;
+import org.jahia.services.usermanager.JahiaAdminUser;
+import org.jahia.services.usermanager.JahiaDBUser;
+import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.webdav.DAVFileAccess;
import org.jahia.services.webdav.JahiaWebdavBaseService;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.usermanager.JahiaDBUser;
import org.jahia.tools.imageprocess.ImageInfo;
import org.jahia.tools.imageprocess.ImageProcess;
=
@@ -30,7 +31,6 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
import javax.transaction.Status;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -344,7 +344,8 @@
logger.debug("searching for thumb " + thumbpath);
//DAVFileAccess thumb =3D JahiaWebdavBaseService.getInstance().get=
DAVFileAccess(jParams, thumbpath);
//bypassing rights with fictious root user to test real existence =
of the thumb
- DAVFileAccess thumb =3D JahiaWebdavBaseService.getInstance().getDA=
VFileAccess(jParams,jParams.getSite(),new JahiaDBUser(0,"root","","",1,null=
),thumbpath);
+ JahiaUser user =3D JahiaAdminUser.getAdminUser(jParams.getSiteID()=
) ;
+ DAVFileAccess thumb =3D JahiaWebdavBaseService.getInstance().getDA=
VFileAccess(jParams,jParams.getSite(),user,thumbpath);
=
if (thumb.isValid() && thumb.isImage()) return true;
logger.debug("not found");
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
