Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 15:27:32 +0000 (16:27 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 15:27:32 +0000 (16:27 +0100)
1  2 
tine20/Calendar/Setup/Update/Release9.php

@@@ -207,16 -208,9 +208,19 @@@ class Calendar_Setup_Update_Release9 ex
              $this->_db->query("COMMIT");
          }
  
-         $this->setApplicationVersion('Calendar', '9.9');
+         // if called out of normal update process
+         if ($this->getApplicationVersion == '9.8') {
+             $this->setApplicationVersion('Calendar', '9.9');
+         }
      }
 +
 +    /**
 +     * update to 10.0
 +     *
 +     * @return void
 +     */
 +    public function update_9()
 +    {
 +        $this->setApplicationVersion('Calendar', '10.0');
 +    }
  }