Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
c32e17e3
Commit
c32e17e3
authored
May 07, 2007
by
Dries
Browse files
- Patch
#141665
by ChrisKennedy: E_ALL fixes.
parent
1e6c37ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/forum/forum.module
View file @
c32e17e3
...
...
@@ -350,7 +350,7 @@ function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
*/
function
forum_submit
(
&
$node
)
{
// Make sure all fields are set properly:
$node
->
icon
=
$node
->
icon
?
$node
->
icon
:
''
;
$node
->
icon
=
!
empty
(
$node
->
icon
)
?
$node
->
icon
:
''
;
if
(
$node
->
taxonomy
)
{
// Get the forum terms from the (cached) tree
...
...
@@ -838,7 +838,7 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
$sql_count
=
db_rewrite_sql
(
"SELECT COUNT(n.nid) FROM
{
node
}
n INNER JOIN
{
term_node
}
r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum'"
);
$result
=
pager_query
(
$sql
,
$forum_per_page
,
0
,
$sql_count
,
$tid
);
$topics
=
array
();
while
(
$topic
=
db_fetch_object
(
$result
))
{
if
(
$user
->
uid
)
{
// folder is new if topic is new or there are new comments since last visit
...
...
@@ -1038,7 +1038,7 @@ function theme_forum_list($forums, $parents, $tid) {
*/
function
theme_forum_topic_list
(
$tid
,
$topics
,
$sortby
,
$forum_per_page
)
{
global
$forum_topic_list_header
;
$rows
=
array
();
if
(
$topics
)
{
foreach
(
$topics
as
$topic
)
{
...
...
@@ -1139,7 +1139,7 @@ function theme_forum_topic_navigation($node) {
// Word break (a is an inline element)
$output
.
=
' '
;
}
if
(
$next
)
{
if
(
!
empty
(
$next
)
)
{
$output
.
=
l
(
$next
->
title
.
t
(
' ›'
),
'node/'
.
$next
->
nid
,
array
(
'class'
=>
'topic-next'
,
'title'
=>
t
(
'Go to next forum topic'
)));
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment