Merge OpenOLAT 9.0 to OpenOLAT default branch with f4bc2d8752840098e8017aa837b2197e02f7f837

src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLocker.java

@@ -179,6 +179,7 @@ public class ClusterLocker implements Locker, GenericEventListener {
 	 * Use 'releaseLock' as method to release a lock. 
 	 * @param lock  release this lockentry 
 	 */
+	@Override
 	public void releaseLockEntry(LockEntry lockEntry) {
 		String asset = lockEntry.getKey();
 		Identity releaseRequestor = lockEntry.getOwner();
@@ -193,7 +194,7 @@ public class ClusterLocker implements Locker, GenericEventListener {
 		} else {
 			// check that entry was previously locked by the same user that now wants to release the lock.
 			Identity ownwer = li.getOwner();
-			if (releaseRequestor.getName().equals(ownwer.getName())) {
+			if (releaseRequestor.getKey().equals(ownwer.getKey())) {
 				// delete the lock
 				clusterLockManager.deleteLock(li);
 			} else {

src/main/java/org/olat/modules/webFeed/ui/blog/_content/info.html

@@ -3,16 +3,14 @@
 		<div class="o_feed_edit">$r.render("feed.edit")</div>
 	#end		
 	<h3>$r.escapeHtml($feed.getTitle())</h3>
-	<p>$!helper.getFeedDescriptionForBrowser()</p>
+	<p class="o_blog_description">$!helper.getFeedDescriptionForBrowser()</p>
 	#if ($helper.getImageUrl() && $helper.getImageUrl() != "")
 		<img class="icon" src="$helper.getImageUrl()" alt="Blog Image" />
 	#end
 	#if ( !$feed.isUndefined() )
-		<p>
-			<div class="o_blog_subscription">
-				<a href="$!helper.getFeedUrl()" class="o_blog_rss_link" target="_blank">$r.translate("blog.subscribe.to.this.feed")</a>
-			</div>
-		</p>
+		<div class="o_blog_subscription">
+			<a href="$!helper.getFeedUrl()" class="o_blog_rss_link" target="_blank">$r.translate("blog.subscribe.to.this.feed")</a>
+		</div>
 	#end	
 	#if ($feed.getAuthor() && $feed.getAuthor() != "")
 		<p class="o_author">$r.translate("feed.author") $feed.getAuthor(). $r.translate("feed.last.change") $!helper.getLastModified()</p>

src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html

@@ -22,7 +22,7 @@
 		</a>
 	#end
 	<p class="o_podcast_date">$!helper.getLastModified($item)</p>
-	<p>$!helper.getItemDescriptionForBrowser($item)</p>
+	<p class="o_podcast_description">$!helper.getItemDescriptionForBrowser($item)</p>
 	
 	#if ($!item.getEnclosure())								
 		<div id="o_podcast_episode" class="o_podcast_$!helper.getMediaType($item.getEnclosure())"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this media file.</div>

src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html

@@ -38,9 +38,9 @@
 			#if ("$!episode.getExternalLink()" != "")
 				</a>
 			#end
-			<p>$!helper.getMediaType($episode.getEnclosure())</p>
+			<p class="o_podcast_media_type">$!helper.getMediaType($episode.getEnclosure())</p>
 			<p class="o_podcast_date">$!helper.getLastModified($episode)</p>
-			<p>$!helper.getItemDescriptionForBrowser($episode)</p>
+			<p class="o_podcast_description">$!helper.getItemDescriptionForBrowser($episode)</p>
 			
 			#if ($!episode.getEnclosure())								
 				<div id="o_podcast_episode_$velocityCount" name="o_podcast_episode_$velocityCount" class="o_podcast_$!helper.getMediaType($episode.getEnclosure())" ><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this media file.</div>

src/main/java/org/olat/modules/webFeed/ui/podcast/_content/info.html

@@ -12,9 +12,9 @@
 	#end
 	<p class="o_podcast_date">$!helper.getLastModified()</p>
 	#if ($!feed.getAuthor())
-		<p>$r.translate("feed.author"): $feed.getAuthor()</p>
+		<p class="o_author">$r.translate("feed.author"): $feed.getAuthor()</p>
 	#end
-	<p>$!helper.getFeedDescriptionForBrowser()</p>
+	<p class="o_podcast_description">$!helper.getFeedDescriptionForBrowser()</p>
 </div>
 #if ( !$feed.isUndefined() && $helper.getFeedUrl() )
 	<div class="o_podcast_subscription">

src/main/java/org/olat/search/service/searcher/SearchResultsImpl.java

@@ -40,6 +40,7 @@ import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.search.highlight.Highlighter;
 import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
 import org.apache.lucene.search.highlight.QueryScorer;
+import org.apache.lucene.search.highlight.SimpleHTMLEncoder;
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
 import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.id.Identity;
@@ -255,7 +256,8 @@ public class SearchResultsImpl implements SearchResults {
 	 * @throws IOException
 	 */
 	private void doHighlight(Query query, Analyzer analyzer, Document doc, ResultDocument resultDocument) throws IOException {
-		Highlighter highlighter = new Highlighter(new SimpleHTMLFormatter(HIGHLIGHT_PRE_TAG,HIGHLIGHT_POST_TAG) , new QueryScorer(query));
+		Highlighter highlighter = new Highlighter(new SimpleHTMLFormatter(HIGHLIGHT_PRE_TAG,HIGHLIGHT_POST_TAG) ,
+				new SimpleHTMLEncoder(), new QueryScorer(query));
 		// Get 3 best fragments of content and seperate with a "..."
 		try {
 			//highlight content