You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/01/08 14:33:39 UTC

svn commit: r1723726 - in /openmeetings/application: branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/

Author: solomax
Date: Fri Jan  8 13:33:39 2016
New Revision: 1723726

URL: http://svn.apache.org/viewvc?rev=1723726&view=rev
Log:
[OPENMEETINGS-1295] profile image 'anticache' is added

Modified:
    openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java

Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java?rev=1723726&r1=1723725&r2=1723726&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java Fri Jan  8 13:33:39 2016
@@ -53,7 +53,9 @@ public class ProfileImageResourceReferen
 	public static String getUrl(RequestCycle rc, User u) {
 		String uri = u.getPictureuri();
 		if (!isAbsolute(uri)) {
-			uri = rc.urlFor(new ProfileImageResourceReference(), new PageParameters().add("id", u.getId())).toString();
+			File img = OmFileHelper.getUserProfilePicture(u.getId(), uri);
+			uri = rc.urlFor(new ProfileImageResourceReference()
+					, new PageParameters().add("id", u.getId()).add("anticache", img.lastModified())).toString();
 		}
 		return uri;
 	}

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java?rev=1723726&r1=1723725&r2=1723726&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java Fri Jan  8 13:33:39 2016
@@ -53,7 +53,9 @@ public class ProfileImageResourceReferen
 	public static String getUrl(RequestCycle rc, User u) {
 		String uri = u.getPictureuri();
 		if (!isAbsolute(uri)) {
-			uri = rc.urlFor(new ProfileImageResourceReference(), new PageParameters().add("id", u.getId())).toString();
+			File img = OmFileHelper.getUserProfilePicture(u.getId(), uri);
+			uri = rc.urlFor(new ProfileImageResourceReference()
+					, new PageParameters().add("id", u.getId()).add("anticache", img.lastModified())).toString();
 		}
 		return uri;
 	}