Merge branch 'allow-markup-in-dialog' into release-2.15.6

oat-sa · Apr 12, 2016 · 9b6d753 · 9b6d753
2 parents 87f90c5 + 71a4043
commit 9b6d753
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/manifest.php b/manifest.php
@@ -27,7 +27,7 @@
     'label' => 'Tao base',
     'description' => 'TAO meta-extension',
     'license' => 'GPL-2.0',
-    'version' => '2.15.5',
+    'version' => '2.15.6',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(
         'generis' => '>=2.7.1'

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -447,8 +447,7 @@ public function update($initialVersion) {
             $this->setVersion('2.15.5');
         }
 
-
-        return null;
+        $this->skip('2.15.5', '2.15.6');
     }
 
     private function migrateFsAccess() {

diff --git a/views/js/ui/dialog/tpl/body.tpl b/views/js/ui/dialog/tpl/body.tpl
@@ -3,7 +3,7 @@
         <p class="message">{{message}}</p>
 
         {{#if content}}
-        <div class="content">{{content}}</div>
+        <div class="content">{{{content}}}</div>
         {{/if}}
 
         <div class="buttons rgt"></div>