diff options
| -rw-r--r-- | ext/imap/php_imap.c | 9 | ||||
| -rw-r--r-- | ext/imap/php_imap.h | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 335be57bf7..dfe870635c 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -19,6 +19,7 @@ | Antoni Pamies Olive <toni@readysoft.net> | | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | | Chuck Hagenbuch <chuck@horde.org> | + | Andrew Skalski <askalski@chekinc.com> | | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ @@ -2682,12 +2683,12 @@ PHP_FUNCTION(imap_status) } #ifdef SA_QUOTA if(IMAPG(status_flags) & SA_QUOTA) { - add_property_long(return_value,"quota",status_quota); + add_property_long(return_value,"quota",IMAPG(status_quota)); } #endif #ifdef SA_QUOTA if(IMAPG(status_flags) & SA_QUOTA_ALL) { - add_property_long(return_value,"quota_all",status_quota_all); + add_property_long(return_value,"quota_all",IMAPG(status_quota_all)); } #endif } else { @@ -3866,12 +3867,12 @@ void mm_status(MAILSTREAM *stream,char *mailbox,MAILSTATUS *status) #ifdef SA_QUOTA if (IMAPG(status_flags) & SA_QUOTA) { - status_quota=status->quota; + IMAPG(status_quota)=status->quota; } #endif #ifdef SA_QUOTA_ALL if (IMAPG(status_flags) & SA_QUOTA_ALL) { - status_quota_all=status->quota_all; + IMAPG(status_quota_all)=status->quota_all; } #endif } diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h index a7bde666e3..dbf4c84eb4 100644 --- a/ext/imap/php_imap.h +++ b/ext/imap/php_imap.h @@ -44,8 +44,8 @@ typedef struct php_imap_le_struct { long flags; #ifdef OP_RELOGIN /* AJS: busy flag for persistent connections, pointers for chaining */ - struct php3_imap_le_struct *next; - struct php3_imap_le_struct **prev; + struct php_imap_le_struct *next; + struct php_imap_le_struct **prev; char busy; #endif } pils; |