Merge branch '2.3.x' into 2.3.x-saas

Conflicts: airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00 · 2013-01-30 18:31:45 -05:00 · 0a198ae424
commit 0a198ae424
parent d47469be25 3553ebc2ee
20 changed files with 184 additions and 51 deletions
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@ -28,7 +28,7 @@ function rebuildStreamURL(ele){
    }else{
        streamurl = "http://"+host+":"+port+"/"
    }
-    div.find("#stream_url").html(streamurl)
+    div.find("#stream_url").text(streamurl)
 }
 function restrictOggBitrate(ele, on){
    var div = ele.closest("div")