Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Tenzing
/
Tz Tools
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
daa1703d
authored
2013-06-13 20:59:44 -0400
by
Marty Penner
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Remove some notices/warnings. refs #1650
1 parent
cac6a132
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
com/Menu/Menu.php
com/Notifications/Notifications.php
com/Menu/Menu.php
View file @
daa1703
...
...
@@ -39,6 +39,18 @@ class HierarchicalMenu implements Countable, Iterator {
$last_id
=
$item
->
ID
;
}
elseif
(
$item
->
menu_item_parent
==
$last_id
)
{
if
(
!
property_exists
(
$this
,
'contents'
))
{
$this
->
contents
=
array
();
}
if
(
!
isset
(
$this
->
contents
[
$this
->
id_lookup
[
$last_id
]]))
{
$this
->
contents
[
$this
->
id_lookup
[
$last_id
]]
=
new
\StdClass
;
}
if
(
!
property_exists
(
$this
->
contents
[
$this
->
id_lookup
[
$last_id
]],
'_children'
))
{
$this
->
contents
[
$this
->
id_lookup
[
$last_id
]]
->
_children
=
null
;
}
$this
->
contents
[
$this
->
id_lookup
[
$last_id
]]
->
_children
=
true
;
$this
->
contents
[
$this
->
id_lookup
[
$last_id
]]
->
classes
[]
=
'menu-item-children'
;
$nest
[]
=
$last_id
;
...
...
com/Notifications/Notifications.php
View file @
daa1703
...
...
@@ -201,7 +201,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args =
$notification
->
trigger
=
$details
[
'trigger'
];
$notification
->
status
=
isset
(
$details
[
'status'
])
?
$details
[
'status'
]
:
"active"
;
$notification
->
type
=
$details
[
'type'
];
$notification
->
sendto
=
$details
[
'sendto'
];
$notification
->
sendto
=
@
$details
[
'sendto'
];
$notification
->
is_email
=
((
$email
[
'text'
]
!=
""
||
$email
[
'html'
]
!=
""
)
&&
$email
[
'subject'
]
!=
""
)
?
true
:
false
;
$notification
->
is_system
=
(
isset
(
$system
[
'message'
])
&&
$system
[
'message'
]
!=
""
)
?
true
:
false
;
...
...
@@ -255,7 +255,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args =
$from_email
=
get_bloginfo
(
'admin_email'
);
$subject
=
strip_tags
(
$contents
[
'subject'
]);
$html
=
$contents
[
'html'
];
$html
=
@
$contents
[
'html'
];
$alttext
=
strip_tags
(
$contents
[
'text'
]);
foreach
(
$args
as
$key
=>
$val
)
{
...
...
Please
register
or
sign in
to post a comment