[Bps-public-commit] Net-IMAP-Server branch, master, updated. 1.25-5-ga0fbb38

[Alex M Vandiver]

The branch, master has been updated
       via  a0fbb3808d93377dae9eddd9c79a0f47035e22e7 (commit)
       via  833c1e70b348c77f53544490dc6852696acf5da2 (commit)
      from  fed18b138a3b935286c8d2577798beb0875fbc85 (commit)

Summary of changes:
 lib/Net/IMAP/Server/Command/Select.pm |    2 +-
 lib/Net/IMAP/Server/Mailbox.pm        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 833c1e70b348c77f53544490dc6852696acf5da2
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sat Dec 12 01:26:34 2009 -0500

    Fix precedence on read-only detection

diff --git a/lib/Net/IMAP/Server/Mailbox.pm b/lib/Net/IMAP/Server/Mailbox.pm
index d51f936..8c78eda 100644
--- a/lib/Net/IMAP/Server/Mailbox.pm
+++ b/lib/Net/IMAP/Server/Mailbox.pm
@@ -549,7 +549,7 @@ sub read_only {
     my $self = shift;
     return unless Net::IMAP::Server->connection;
     return $self->selected
-        and Net::IMAP::Server->connection->selected_read_only;
+        && Net::IMAP::Server->connection->selected_read_only;
 }
 
 =head3 select

commit a0fbb3808d93377dae9eddd9c79a0f47035e22e7
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sat Dec 12 01:27:37 2009 -0500

    Remove some indirection to simplify read-only logic

diff --git a/lib/Net/IMAP/Server/Command/Select.pm b/lib/Net/IMAP/Server/Command/Select.pm
index 575e1b8..e746a8d 100644
--- a/lib/Net/IMAP/Server/Command/Select.pm
+++ b/lib/Net/IMAP/Server/Command/Select.pm
@@ -49,7 +49,7 @@ sub run {
             . join( ' ', $mailbox->permanentflags )
             . ')]' );
 
-    if ( $self->connection->selected->read_only ) {
+    if ( $mailbox->read_only ) {
         $self->ok_command("[READ-ONLY] Completed");
     } else {
         $self->ok_command("[READ-WRITE] Completed");

-----------------------------------------------------------------------