Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rules-3458065
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
rules-3458065
Commits
1360e253
Commit
1360e253
authored
16 years ago
by
fago
Browse files
Options
Downloads
Patches
Plain Diff
fixed altering arguments passed to rules - all tests pass again.
parent
0e30b01a
No related branches found
Branches containing commit
Tags
8.x-3.0-beta5
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
rules/rules.data_types.inc
+5
-1
5 additions, 1 deletion
rules/rules.data_types.inc
rules/rules.module
+1
-2
1 addition, 2 deletions
rules/rules.module
rules/rules.variables.inc
+3
-1
3 additions, 1 deletion
rules/rules.variables.inc
with
9 additions
and
4 deletions
rules/rules.data_types.inc
+
5
−
1
View file @
1360e253
...
...
@@ -7,8 +7,12 @@
/**
* Gets the right data object for the given argument information
* @param $info
* Info about the data type.
* @param $data
* Optional data to set. Warning: Only use this, when loosing a reference is ok.
*/
function
rules_get_data_object
(
$info
,
$data
=
NULL
)
{
function
rules_get_data_object
(
$info
,
&
$data
=
NULL
)
{
$class
=
'rules_data_type'
;
if
((
$data_type
=
rules_get_data_types
(
$info
[
'type'
]))
&&
class_exists
(
$data_type
[
'class'
]))
{
$class
=
$data_type
[
'class'
];
...
...
This diff is collapsed.
Click to expand it.
rules/rules.module
+
1
−
2
View file @
1360e253
...
...
@@ -290,7 +290,6 @@ function rules_theme() {
* Returns info about all defined actions
*/
function
rules_get_actions
(
$key
=
'all'
)
{
//TODO: integrate d6 actions
return
rules_gather_data
(
'rules_action_info'
,
$key
);
}
...
...
@@ -485,7 +484,7 @@ function rules_clear_cache($immediate = TRUE) {
}
/**
* Implementation of hook_flush_caches
* Implementation of hook_flush_caches
().
*/
function
rules_flush_caches
()
{
variable_del
(
'rules_inactive_sets'
);
...
...
This diff is collapsed.
Click to expand it.
rules/rules.variables.inc
+
3
−
1
View file @
1360e253
...
...
@@ -279,7 +279,9 @@ class rules_variable {
function
_set_data
(
&
$data
)
{
if
(
isset
(
$data
))
{
$this
->
data
=
rules_get_data_object
(
$this
->
info
,
$data
);
$this
->
data
=
rules_get_data_object
(
$this
->
info
);
// Set the data in the data object and make sure to keep a reference intact
$this
->
data
->
init
(
$data
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment