diff --git a/README.md b/README.md
index 641e5097e..e35a5cde9 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ TODO
+ *Version*: 2.12.15
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **286249**
++ *Line count*: **286257**
+ *Field count*: **1580**
+ *File count*: **1829**
+ *Folder count*: **256**
diff --git a/admin/README.txt b/admin/README.txt
index 641e5097e..e35a5cde9 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -147,7 +147,7 @@ TODO
+ *Version*: 2.12.15
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **286249**
++ *Line count*: **286257**
+ *Field count*: **1580**
+ *File count*: **1829**
+ *Folder count*: **256**
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 487f5267b..fb0608da7 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -9473,7 +9473,7 @@ class Get
{
if (ComponentbuilderHelper::checkString($add_rule_path['path']))
{
- $module->add_rule_path[$unique][] = $add_rule_path['path'];
+ $module->add_rule_path[$unique] = $add_rule_path['path'];
}
}
}
@@ -9485,7 +9485,7 @@ class Get
{
if (ComponentbuilderHelper::checkString($add_field_path['path']))
{
- $module->add_field_path[$unique][] = $add_field_path['path'];
+ $module->add_field_path[$unique] = $add_field_path['path'];
}
}
}
@@ -10416,7 +10416,7 @@ class Get
{
if (ComponentbuilderHelper::checkString($add_rule_path['path']))
{
- $plugin->add_rule_path[$unique][] = $add_rule_path['path'];
+ $plugin->add_rule_path[$unique] = $add_rule_path['path'];
}
}
}
@@ -10428,7 +10428,7 @@ class Get
{
if (ComponentbuilderHelper::checkString($add_field_path['path']))
{
- $plugin->add_field_path[$unique][] = $add_field_path['path'];
+ $plugin->add_field_path[$unique] = $add_field_path['path'];
}
}
}
diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php
index 79532517f..dfde9137c 100644
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@@ -946,44 +946,78 @@ class Structure extends Get
{
// default to the field set name
$label = $fieldset;
- if (isset(
- $module->fieldsets_label[$file
- . $field_name . $fieldset]
- ))
+ if (isset($module->fieldsets_label[$file . $field_name . $fieldset]))
{
- $label = $module->fieldsets_label[$file
- . $field_name . $fieldset];
+ $label = $module->fieldsets_label[$file . $field_name . $fieldset];
}
// add path to module rules and custom fields
- if (isset(
- $module->fieldsets_paths[$file
- . $field_name . $fieldset]
- )
- && $module->fieldsets_paths[$file
- . $field_name . $fieldset] == 2)
+ if (isset($module->fieldsets_paths[$file . $field_name . $fieldset])
+ && ($module->fieldsets_paths[$file . $field_name . $fieldset] == 2
+ || $module->fieldsets_paths[$file . $field_name . $fieldset] == 3))
{
+ if ($module->target == 2)
+ {
+ if (!isset($module->add_rule_path[$file . $field_name . $fieldset]))
+ {
+ $module->add_rule_path[$file . $field_name . $fieldset] =
+ '/administrator/modules/'
+ . $module->file_name . '/rules';
+ }
+
+ if (!isset($module->add_field_path[$file . $field_name . $fieldset]))
+ {
+ $module->add_field_path[$file . $field_name . $fieldset] =
+ '/administrator/modules/'
+ . $module->file_name . '/fields';
+ }
+ }
+ else
+ {
+ if (!isset($module->add_rule_path[$file . $field_name . $fieldset]))
+ {
+ $module->add_rule_path[$file . $field_name . $fieldset] =
+ '/modules/' . $module->file_name
+ . '/rules';
+ }
+
+ if (!isset($module->add_field_path[$file . $field_name . $fieldset]))
+ {
+ $module->add_field_path[$file . $field_name . $fieldset] =
+ '/modules/' . $module->file_name
+ . '/fields';
+ }
+ }
+ }
+ // add path to module rules and custom fields
+ if (isset($module->add_rule_path[$file . $field_name . $fieldset])
+ || isset($module->add_field_path[$file . $field_name . $fieldset]))
+ {
+
$xml .= PHP_EOL . $this->_t(1) . '';
- $xml .= PHP_EOL . $this->_t(1)
- . '