[dev] [commits] Horde branch master updated. 6047dd2367bc322fbe0cf037c7a7e92e4dbd1729

[Michael M Slusarz]

Quoting Jan Schneider <jan at horde.org>:

> commit 6047dd2367bc322fbe0cf037c7a7e92e4dbd1729
> Author: Jan Schneider <jan at horde.org>
> Date:   Wed Jun 8 18:50:10 2011 +0200
>
>     This was only a temporarily regression in Git.
>
>  imp/docs/CHANGES |    1 -
>  imp/package.xml  |    1 -
>  2 files changed, 0 insertions(+), 2 deletions(-)
>
> http://git.horde.org/horde-git/-/commit/6047dd2367bc322fbe0cf037c7a7e92e4dbd1729

Unfortunately, it wasn't:

slusarz at bigworm % git diff imp-5.0.5 imp-5.0.6 .
[...]
diff --git a/imp/lib/Folder.php b/imp/lib/Folder.php
index 9d39746..18f78f1 100644
--- a/imp/lib/Folder.php
+++ b/imp/lib/Folder.php
@@ -176,7 +176,7 @@ class IMP_Folder
              return false;
          }

-        if ((!$force && $old->fixed) || !$old->deletembox) {
+        if ((!$force && $old->fixed) || !$old->access_deletembox) {
              $GLOBALS['notification']->push(sprintf(_("The folder  
\"%s\" may not be renamed."), $old->display), 'horde.error');
              return false;
          }


michael

___________________________________
Michael Slusarz [slusarz at horde.org]