diogo/xmpphp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source 
Merge remote branch 'github-ivan1986/master'
This commit is contained in:
Christian Weiske 2010-05-30 21:01:17 +02:00
commit 07a9b7ea23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XMPPHP/XMLStream.php
View File

@ -465,8 +465,7 @@ class XMPPHP_XMLStream {
} }
$part = fread($this->socket, 4096); $part = fread($this->socket, 4096);
stream_set_blocking($this->socket, 1); stream_set_blocking($this->socket, 1);
if ($part === false) {
if (!$part) {
if($this->reconnect) { if($this->reconnect) {
$this->doReconnect(); $this->doReconnect();
} else { } else {

2
XMPPHP/XMPP.php
View File

@ -214,7 +214,7 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream {
$out = "<presence"; $out = "<presence";
if($to) $out .= " to=\"$to\""; if($to) $out .= " to=\"$to\"";
if($type) $out .= " type='$type'"; if($type) $out .= " type='$type'";
if($show == 'available' and !$status) { if($show == 'available' and !$status and $priority !== null) {
$out .= "/>"; $out .= "/>";
} else { } else {
$out .= ">"; $out .= ">";