mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Do not try to send jabber notifications if no jid entered (Bug #36775)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9078 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
f588f58fa9
commit
c831a3edce
2 changed files with 12 additions and 0 deletions
|
@ -91,6 +91,7 @@
|
||||||
<li>[Fix] Allow the UCP group management to work for groups with avatars. (Bug #37375)</li>
|
<li>[Fix] Allow the UCP group management to work for groups with avatars. (Bug #37375)</li>
|
||||||
<li>[Fix] Fix header list build for replying oldest PM in PM history (Bug #37275)</li>
|
<li>[Fix] Fix header list build for replying oldest PM in PM history (Bug #37275)</li>
|
||||||
<li>[Fix] Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)</li>
|
<li>[Fix] Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)</li>
|
||||||
|
<li>[Fix] Do not try to send jabber notifications if no jid entered (Bug #36775)</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3>
|
<a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3>
|
||||||
|
|
|
@ -97,6 +97,12 @@ class messenger
|
||||||
*/
|
*/
|
||||||
function im($address, $realname = '')
|
function im($address, $realname = '')
|
||||||
{
|
{
|
||||||
|
// IM-Addresses could be empty
|
||||||
|
if (!$address)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$pos = isset($this->addresses['im']) ? sizeof($this->addresses['im']) : 0;
|
$pos = isset($this->addresses['im']) ? sizeof($this->addresses['im']) : 0;
|
||||||
$this->addresses['im'][$pos]['uid'] = trim($address);
|
$this->addresses['im'][$pos]['uid'] = trim($address);
|
||||||
$this->addresses['im'][$pos]['name'] = trim($realname);
|
$this->addresses['im'][$pos]['name'] = trim($realname);
|
||||||
|
@ -443,6 +449,11 @@ class messenger
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (empty($this->addresses['im']))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$use_queue = false;
|
$use_queue = false;
|
||||||
if ($config['jab_package_size'] && $this->use_queue)
|
if ($config['jab_package_size'] && $this->use_queue)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue