Merge branch 'master' of ssh://multimediatechnology.at:5412/var/www/v…

…irthosts/marblerun.multimediatechnology.at/gitrepository
roboshoes · Jan 9, 2013 · c732f53 · c732f53
2 parents 46ebe8f + ae6ecaf
commit c732f53
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/models/track.rb b/app/models/track.rb
@@ -34,8 +34,8 @@ def json_track
 
     hash['id'] = self.id
     hash['json'] = ActiveSupport::JSON.decode(self.json)
-    hash['trackname'] = self.trackname
-    hash['username'] = self.username
+    hash['trackname'] = self.trackname.gsub(/<\/?[^>]*>/, "")
+    hash['username'] = self.username.gsub(/<\/?[^>]*>/, "")
     hash['imagedata'] = self.imagedata 
     hash['length'] = self.length
     hash['likes'] = self.likes