Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Nick and Subject are binaries, defaults should be binaries as well. #11

Closed
wants to merge 2 commits into from

3 participants

@loe

Subject and Subject Author are binaries, and the record should reflect that.

@loe

Corrected the title, browser had filled with with previous pull topic.

@badlop
Collaborator

The nick of occupant is binary, but the subject and subject_author stored in the database are strings. When I apply your patch, ejabberd crashes.

@loe

Interesting, I do not store any rooms in the database, they are always in memory and via debugging I see them as binaries.

@badlop
Collaborator

I've reported this problem in https://support.process-one.net/browse/EJAB-1419

Let's keep this pull request open until the problem is solved.

@loe loe Merge branch 'master' of git://github.com/processone/ejabberd into up…
…stream

* 'master' of git://github.com/processone/ejabberd: (39 commits)
  Fix crash when SASL PLAIN denies auth (EJAB-1425)
  Update the changed string in the PO translation files
  Change string in WebAdmin to reuse an existing one
  Update version numbers of the related: exmpp, ejabberd 2, and Erlang
  Document that ODBC tables are created by ejabberd itself (EJAB-1421)
  Only attempt to migrate an old ODBC table if it still exists
  fix PEP broadcasting (thanks to Karim Gemayel)(EJAB-1411)
  Include client namespace in CAPs queries (EJAB-1411)
  Fix bashism and remove duplicate unused option (EJAB-1404)
  Fix internal-server-error error response (EJAB-1414).
  If the port number isn't listener, then specify the protocol (EJAB-1418)
  captcha_host must have the port number to get protocol (EJAB-1418)
  ejabberdctl needs space between INET_DIST_INTERFACE (thanks to Dale Chase)(EJAB-1416)
  Fix to show correctly the command that is unknown
  Revert "Mention in release notes that Pubsub/PEP isn't ready for alpha-testing (EJAB-1393)"
  Tweak pg2_backport.erl to work with Erlang older than R13A (EJAB-1349)
  Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391)
  Forward old messages to newly spawned extauth process (thanks to Mika Seppänen)(EJAB-1385)
  fix broadcast issue (EJAB-1411)
  fix API issue for subscribe/unsubscribe (EJAB-1410)
  ...
c4ed682
@cromain cromain closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 20, 2011
  1. @loe
Commits on Mar 16, 2011
  1. @loe

    Merge branch 'master' of git://github.com/processone/ejabberd into up…

    loe authored
    …stream
    
    * 'master' of git://github.com/processone/ejabberd: (39 commits)
      Fix crash when SASL PLAIN denies auth (EJAB-1425)
      Update the changed string in the PO translation files
      Change string in WebAdmin to reuse an existing one
      Update version numbers of the related: exmpp, ejabberd 2, and Erlang
      Document that ODBC tables are created by ejabberd itself (EJAB-1421)
      Only attempt to migrate an old ODBC table if it still exists
      fix PEP broadcasting (thanks to Karim Gemayel)(EJAB-1411)
      Include client namespace in CAPs queries (EJAB-1411)
      Fix bashism and remove duplicate unused option (EJAB-1404)
      Fix internal-server-error error response (EJAB-1414).
      If the port number isn't listener, then specify the protocol (EJAB-1418)
      captcha_host must have the port number to get protocol (EJAB-1418)
      ejabberdctl needs space between INET_DIST_INTERFACE (thanks to Dale Chase)(EJAB-1416)
      Fix to show correctly the command that is unknown
      Revert "Mention in release notes that Pubsub/PEP isn't ready for alpha-testing (EJAB-1393)"
      Tweak pg2_backport.erl to work with Erlang older than R13A (EJAB-1349)
      Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391)
      Forward old messages to newly spawned extauth process (thanks to Mika Seppänen)(EJAB-1385)
      fix broadcast issue (EJAB-1411)
      fix API issue for subscribe/unsubscribe (EJAB-1410)
      ...
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/mod_muc/mod_muc_room.erl
  2. +2 −2 src/mod_muc/mod_muc_room.hrl
View
4 src/mod_muc/mod_muc_room.erl
@@ -2175,8 +2175,8 @@ send_subject(JID, Lang, StateData) ->
Nick ->
Subject = StateData#state.subject,
Packet = exmpp_message:groupchat(Subject,
- Nick ++ translate:translate(Lang,
- " has set the subject to: ") ++ Subject),
+ binary_to_list(Nick) ++ translate:translate(Lang,
+ " has set the subject to: ") ++ binary_to_list(Subject)),
ejabberd_router:route(
StateData#state.jid,
JID,
View
4 src/mod_muc/mod_muc_room.hrl
@@ -70,8 +70,8 @@
robots = ?DICT:new(),
affiliations = ?DICT:new(),
history,
- subject = "",
- subject_author = "",
+ subject = <<>>,
+ subject_author = <<>>,
just_created = false,
activity = treap:empty(),
room_shaper,
Something went wrong with that request. Please try again.