diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/block/block.module | 2 | ||||
| -rw-r--r-- | modules/comment/comment.module | 6 | ||||
| -rw-r--r-- | modules/forum/forum.module | 12 | ||||
| -rw-r--r-- | modules/node/node.module | 8 | ||||
| -rw-r--r-- | modules/poll/poll.module | 6 | ||||
| -rw-r--r-- | modules/profile/profile.module | 6 | ||||
| -rw-r--r-- | modules/user/user.module | 8 |
7 files changed, 21 insertions, 27 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index ec87d3ca3..cbaa3eff6 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -103,7 +103,7 @@ function block_help($path, $arg) { function block_theme() { return array( 'block_admin_display' => array( - 'file' => 'block-admin-display', + 'template' => 'block-admin-display', 'arguments' => array('form' => NULL), ), ); diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 967e25304..03f19f371 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -160,11 +160,11 @@ function comment_theme() { 'arguments' => array('form' => NULL), ), 'comment' => array( - 'file' => 'comment.tpl.php', + 'template' => 'comment', 'arguments' => array('comment' => NULL, 'node' => NULL, 'links' => array()), ), 'comment_folded' => array( - 'file' => 'comment-folded', + 'template' => 'comment-folded', 'arguments' => array('comment' => NULL), ), 'comment_flat_collapsed' => array( @@ -183,7 +183,7 @@ function comment_theme() { 'arguments' => array('nid' => NULL), ), 'comment_wrapper' => array( - 'file' => 'comment-wrapper', + 'template' => 'comment-wrapper', 'arguments' => array('content' => NULL, 'node' => NULL), ), 'comment_submitted' => array( diff --git a/modules/forum/forum.module b/modules/forum/forum.module index c529682f9..9701ec266 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -34,27 +34,27 @@ function forum_help($path, $arg) { function forum_theme() { return array( 'forums' => array( - 'file' => 'forums', + 'template' => 'forums', 'arguments' => array('forums' => NULL, 'topics' => NULL, 'parents' => NULL, 'tid' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL), ), 'forum_list' => array( - 'file' => 'forum-list', + 'template' => 'forum-list', 'arguments' => array('forums' => NULL, 'parents' => NULL, 'tid' => NULL), ), 'forum_topic_list' => array( - 'file' => 'forum-topic-list', + 'template' => 'forum-topic-list', 'arguments' => array('tid' => NULL, 'topics' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL), ), 'forum_icon' => array( - 'file' => 'forum-icon', + 'template' => 'forum-icon', 'arguments' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0), ), 'forum_topic_navigation' => array( - 'file' => 'forum-topic-navigation', + 'template' => 'forum-topic-navigation', 'arguments' => array('node' => NULL), ), 'forum_submitted' => array( - 'file' => 'forum-submitted', + 'template' => 'forum-submitted', 'arguments' => array('topic' => NULL), ), ); diff --git a/modules/node/node.module b/modules/node/node.module index 9f21f1be3..3463582bb 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -63,7 +63,7 @@ function node_theme() { return array( 'node' => array( 'arguments' => array('node' => NULL, 'teaser' => FALSE, 'page' => FALSE), - 'file' => 'node', + 'template' => 'node', ), 'node_list' => array( 'arguments' => array('items' => NULL, 'title' => NULL), @@ -74,32 +74,26 @@ function node_theme() { 'node_filter_form' => array( 'arguments' => array('form' => NULL), 'file' => 'node.admin.inc', - 'function' => 'theme_node_filter_form', ), 'node_filters' => array( 'arguments' => array('form' => NULL), 'file' => 'node.admin.inc', - 'function' => 'theme_node_filters', ), 'node_admin_nodes' => array( 'arguments' => array('form' => NULL), 'file' => 'node.admin.inc', - 'function' => 'theme_node_admin_nodes', ), 'node_add_list' => array( 'arguments' => array('content' => NULL), 'file' => 'node.pages.inc', - 'function' => 'theme_node_add_list', ), 'node_form' => array( 'arguments' => array('form' => NULL), 'file' => 'node.pages.inc', - 'function' => 'theme_node_form', ), 'node_preview' => array( 'arguments' => array('node' => NULL), 'file' => 'node.pages.inc', - 'function' => 'theme_node_preview', ), 'node_log_message' => array( 'arguments' => array('log' => NULL), diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 14936a2af..64f83f0b3 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -33,15 +33,15 @@ function poll_init() { function poll_theme() { return array( 'poll_vote' => array( - 'file' => 'poll-vote', + 'template' => 'poll-vote', 'arguments' => array('form' => NULL), ), 'poll_results' => array( - 'file' => 'poll-results', + 'template' => 'poll-results', 'arguments' => array('raw_title' => NULL, 'results' => NULL, 'votes' => NULL, 'raw_links' => NULL, 'block' => NULL, 'nid' => NULL, 'vote' => NULL), ), 'poll_bar' => array( - 'file' => 'poll-bar', + 'template' => 'poll-bar', 'arguments' => array('title' => NULL, 'votes' => NULL, 'total_votes' => NULL, 'vote' => NULL, 'block' => NULL), ), ); diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 78d59ee70..4a253d7e2 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -58,15 +58,15 @@ function profile_theme() { return array( 'profile_block' => array( 'arguments' => array('account' => NULL, 'fields' => array()), - 'file' => 'profile-block', + 'template' => 'profile-block', ), 'profile_listing' => array( 'arguments' => array('account' => NULL, 'fields' => array()), - 'file' => 'profile-listing', + 'template' => 'profile-listing', ), 'profile_wrapper' => array( 'arguments' => array('content' => NULL), - 'file' => 'profile-wrapper', + 'template' => 'profile-wrapper', ) ); } diff --git a/modules/user/user.module b/modules/user/user.module index 9f2686722..56200b84e 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -31,19 +31,19 @@ function user_theme() { return array( 'user_picture' => array( 'arguments' => array('account' => NULL), - 'file' => 'user-picture', + 'template' => 'user-picture', ), 'user_profile' => array( 'arguments' => array('account' => NULL), - 'file' => 'user-profile', + 'template' => 'user-profile', ), 'user_profile_category' => array( 'arguments' => array('element' => NULL), - 'file' => 'user-profile-category', + 'template' => 'user-profile-category', ), 'user_profile_item' => array( 'arguments' => array('element' => NULL), - 'file' => 'user-profile-item', + 'template' => 'user-profile-item', ), 'user_list' => array( 'arguments' => array('users' => NULL, 'title' => NULL), |