Permalink
Browse files

Merge

Merge remote branch 'github-ivan1986/master'
  • Loading branch information...
2 parents 8625895 + 21f4d5c commit 07a9b7ea23386c219ed9fedbf950231cc1ccd290 @cweiske cweiske committed May 30, 2010
Showing with 2 additions and 3 deletions.
  1. +1 −2 XMPPHP/XMLStream.php
  2. +1 −1 XMPPHP/XMPP.php
View
@@ -465,8 +465,7 @@ private function __process($maximum = 5, $return_when_received = false)
}
$part = fread($this->socket, 4096);
stream_set_blocking($this->socket, 1);
-
- if (!$part) {
+ if ($part === false) {
if($this->reconnect) {
$this->doReconnect();
} else {
View
@@ -214,7 +214,7 @@ public function presence($status = null, $show = 'available', $to = null, $type=
$out = "<presence";
if($to) $out .= " to=\"$to\"";
if($type) $out .= " type='$type'";
- if($show == 'available' and !$status) {
+ if($show == 'available' and !$status and $priority !== null) {
$out .= "/>";
} else {
$out .= ">";

0 comments on commit 07a9b7e

Please sign in to comment.