Merge master into dev

This commit is contained in:
calzoneman 2013-07-03 16:06:13 -04:00
commit 860d81afbc
5 changed files with 10 additions and 5 deletions

View file

@ -788,7 +788,7 @@ function handleModPermissions() {
$("#opt_voteskip_ratio").val(CHANNEL.opts.voteskip_ratio);
$("#csstext").val(CHANNEL.css);
$("#jstext").val(CHANNEL.js);
$("#motdtext").val(CHANNEL.motd);
$("#motdtext").val(CHANNEL.motd_text);
setVisible("#permedit_tab", CLIENT.rank >= 3);
setVisible("#banlist_tab", hasPermission("ban"));
setVisible("#motdedit_tab", hasPermission("motdedit"));