diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/story.module | 4 | ||||
| -rw-r--r-- | modules/story/story.module | 4 | ||||
| -rw-r--r-- | modules/structure.module | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/modules/story.module b/modules/story.module index 4667494fe..feb65cc32 100644 --- a/modules/story.module +++ b/modules/story.module @@ -8,8 +8,6 @@ $module = array("help" => "story_help", "admin" => "story_admin", "block" => "story_block"); -include_once "includes/structure.inc"; - class Story { function Story($story) { global $user; @@ -191,7 +189,7 @@ function story_block() { function story_query($type = "") { global $status; - $queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"), array("stories without category (integrity)", "WHERE n.cid = '0' ORDER BY n.timestamp DESC"), array("stories without topic (integrity)", "WHERE n.tid = '0' ORDER BY n.timestamp DESC")); + $queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"), array("stories without category (integrity)", "WHERE n.type = 'story' AND n.cid = '0' ORDER BY n.timestamp DESC"), array("stories without topic (integrity)", "WHERE n.type = 'story' AND n.tid = '0' ORDER BY n.timestamp DESC")); return ($queries[$type] ? $queries[$type] : $queries); } diff --git a/modules/story/story.module b/modules/story/story.module index 4667494fe..feb65cc32 100644 --- a/modules/story/story.module +++ b/modules/story/story.module @@ -8,8 +8,6 @@ $module = array("help" => "story_help", "admin" => "story_admin", "block" => "story_block"); -include_once "includes/structure.inc"; - class Story { function Story($story) { global $user; @@ -191,7 +189,7 @@ function story_block() { function story_query($type = "") { global $status; - $queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"), array("stories without category (integrity)", "WHERE n.cid = '0' ORDER BY n.timestamp DESC"), array("stories without topic (integrity)", "WHERE n.tid = '0' ORDER BY n.timestamp DESC")); + $queries = array(array("recent stories", "WHERE n.type = 'story' ORDER BY n.timestamp DESC"), array("posted stories", "WHERE n.type = 'story' AND n.status = '$status[posted]' ORDER BY n.timestamp DESC"), array("queued stories", "WHERE n.type = 'story' AND n.status = '$status[queued]' ORDER BY n.timestamp DESC"), array("dumped stories", "WHERE n.type = 'story' AND n.status = '$status[dumped]' ORDER BY n.timestamp DESC"), array("stories without category (integrity)", "WHERE n.type = 'story' AND n.cid = '0' ORDER BY n.timestamp DESC"), array("stories without topic (integrity)", "WHERE n.type = 'story' AND n.tid = '0' ORDER BY n.timestamp DESC")); return ($queries[$type] ? $queries[$type] : $queries); } diff --git a/modules/structure.module b/modules/structure.module index db4e13ea2..35e7cbf5a 100644 --- a/modules/structure.module +++ b/modules/structure.module @@ -5,9 +5,6 @@ $module = array("admin" => "structure_admin"); $cstatus = array("disabled", "enabled: incl. anonymous", "enabled: excl. anonymous"); $mstatus = array("post new submissions", "moderate new submissions"); -include "includes/structure.inc"; - - function content_types($name, $module) { global $types; if ($module[type]) $types[$name] = $name; |