Fixed issue where permissions created by plugins cannot be saved. Thi…

…s is due to the call to getPermissionObject from generatePermissions does not set the correct pluginBundle flag if the permission is created by a plugin.
vln104 · Oct 29, 2015 · 9aa0554 · 9aa0554
1 parent 2957295
commit 9aa0554
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/bundles/CoreBundle/Security/Permissions/CorePermissions.php b/app/bundles/CoreBundle/Security/Permissions/CorePermissions.php
@@ -215,7 +215,8 @@ public function generatePermissions(array $permissions)
                 $entity->setName(strtolower($name));
 
                 $bit   = 0;
-                $class = $this->getPermissionObject($bundle);
+		$pluginBundles = $this->getPluginBundles();
+                $class = $this->getPermissionObject($bundle, true, array_key_exists(ucfirst($bundle) . "Bundle", $pluginBundles));
 
                 foreach ($perms as $perm) {
                     //get the bit for the perm

diff --git a/app/bundles/FormBundle/Model/FormModel.php b/app/bundles/FormBundle/Model/FormModel.php
@@ -490,7 +490,6 @@ public function populateValuesWithGetParameters(Form $form, &$formHtml)
 
                 switch ($f->getType()) {
                     case 'text':
-                    case 'email':
                         if (preg_match('/<input(.*?)id="mauticform_input_'.$formName.'_'.$alias.'"(.*?)value="(.*?)"(.*?)\/>/i', $formHtml, $match)) {
                             $replace  = '<input'.$match[1].'id="mauticform_input_'.$formName.'_'.$alias.'"'.$match[2].'value="'.urldecode($value).'"'.$match[4].'/>';
                             $formHtml = str_replace($match[0], $replace, $formHtml);