summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-18 23:31:28 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-02-18 23:31:28 +0000
commit72b3c9108cc3344519a5b59188c912952a62806a (patch)
tree5d5570695809a5c181d124d9cb62547d48c32a2b
parentcca1d777485d9b5f41bbc65ad10b002702f0aae4 (diff)
parent7bcfc9f6434e903936cbd6d47a2c25081f75eb04 (diff)
Merge branch 'master' of git://gitorious.org/laconica/mainline into 0.7.x
-rwxr-xr-xscripts/xmppdaemon.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 01fe8914f..ef3f8c63d 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -208,6 +208,8 @@ class XMPPDaemon extends Daemon
{
if (preg_match('/[\[\(]?[Aa]uto[-\s]?[Rr]e(ply|sponse)[\]\)]/', $txt)) {
return true;
+ } else if (preg_match('/^System: Message wasn\'t delivered. Offline storage size was exceeded.$/', $txt)) {
+ return true;
} else {
return false;
}