Merge branch 'develop'

libraries/default/InboxProcessors/templates/User/Registration.php

@@ -89,8 +89,10 @@ echo $this->Bootstrap->modal([
         '<div class="form-container">%s</div>',
         $combinedForm
     ),
-    'confirmText' => __('Create user'),
-    'confirmFunction' => 'submitRegistration'
+    'confirmButton' => [
+        'text' =>  __('Create user'),
+        'onclick' => 'submitRegistration',
+    ],
 ]);
 ?>
 </div>

src/VERSION.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.13",
+    "version": "1.14",
     "application": "Cerebrate"
 }

templates/MetaTemplates/update_all.php

@@ -132,8 +132,10 @@ echo $this->Bootstrap->modal([
     'bodyHtml' => $bodyHtml,
     'size' => $modalSize,
     'type' => $modalType,
-    'confirmText' => __('Update meta-templates'),
-    'confirmFunction' => 'updateMetaTemplate',
+    'confirmButton' => [
+        'text' =>  __('Update meta-templates'),
+        'onclick' => 'updateMetaTemplate',
+    ],
 ]);
 ?>
 

templates/genericTemplates/confirm.php

@@ -36,4 +36,4 @@ $modalOptions = array_merge($defaultOptions, $modalOptions ?? []);
 $modalOptions['bodyHtml'] = $bodyHTML;
 
 echo $this->Bootstrap->modal($modalOptions);
-?>
+