summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/user.go2
-rw-r--r--web/react/components/more_channels.jsx4
2 files changed, 2 insertions, 4 deletions
diff --git a/api/user.go b/api/user.go
index 6528c0f61..ada781bc7 100644
--- a/api/user.go
+++ b/api/user.go
@@ -135,8 +135,6 @@ func createUser(c *Context, w http.ResponseWriter, r *http.Request) {
user.EmailVerified = true
}
- user.EmailVerified = true;
-
ruser := CreateUser(c, team, user)
if c.Err != nil {
return
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index 3cb83cec5..dad0a644a 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -83,7 +83,7 @@ module.exports = React.createClass({
(moreChannels.length ?
<table className="more-channel-table table">
<tbody>
- {this.state.channels.map(function(channel) {
+ {moreChannels.map(function(channel) {
return (
<tr key={channel.id}>
<td>
@@ -108,7 +108,7 @@ module.exports = React.createClass({
<div id="round_3" className="round"></div>
</div>
</div>}
- { server_error }
+ { server_error }
</div>
<div className="modal-footer">
<button type="button" className="btn btn-default" data-dismiss="modal">Close</button>