From b2a6cc3bc13745dd7c9dcb37a7767cbc63ecb85f Mon Sep 17 00:00:00 2001
From: "nils@teampass.net" <nils@teampass.net>
Date: Tue, 10 May 2016 19:17:53 +0200
Subject: [PATCH] 2.1.26-RC1

#1284 fix for can_manage_all_users update during upgrade
---
 install/upgrade_run_2.1.26.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install/upgrade_run_2.1.26.php b/install/upgrade_run_2.1.26.php
index cbd4c83f3..560364786 100644
--- a/install/upgrade_run_2.1.26.php
+++ b/install/upgrade_run_2.1.26.php
@@ -44,11 +44,13 @@ function addColumnIfNotExist($db, $column, $columnAttr = "VARCHAR(255) NULL")
     while ($c = mysqli_fetch_assoc( $columns)) {
         if ($c['Field'] == $column) {
             $exists = true;
-            return false;
+            return true;
         }
     }
     if (!$exists) {
         return mysqli_query($dbTmp, "ALTER TABLE `$db` ADD `$column`  $columnAttr");
+    } else {
+        return false;
     }
 }