diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index ae6430bef989a0cce7d886301c29b12727fc5f60..6093772f419271b63842f4f9637384ccdfd2b987 100644
--- a/modules/blog/blog.info
+++ b/modules/blog/blog.info
@@ -1,4 +1,5 @@
; $Id$
+
name = Blog
description = Enables keeping easily and regularly updated user web pages or blogs.
package = Core - optional
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 1cc82a16d602c803c62c056bed471474b1889a1e..21f58b721cf324fea8d666126063c4642529965e 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -61,7 +61,7 @@ function blog_user($type, &$edit, &$user) {
function blog_help($path, $arg) {
switch ($path) {
case 'admin/help#blog':
- $output = '<p>' . t('The blog module allows registered users to maintain an online journal, or <em>blog</em>. Blogs are made up of individual <em>blog entries</em>, and the blog entries are most often displayed in descending order by creation time.') . '</p>';
+ $output = '<p>' . t('The blog module allows registered users to maintain an online journal, or <em>blog</em>. Blogs are made up of individual <em>blog entries</em>, and the blog entries are most often displayed in descending order by creation time.') . '</p>';
$output .= '<p>' . t('There is an (optional) <em>Blogs</em> menu item added to the Navigation menu, which displays all blogs available on your site, and a <em>My blog</em> item displaying the current user\'s blog entries. The <em>Blog entry</em> menu item under <em>Create content</em> allows new blog entries to be created.') . '</p>';
$output .= '<p>' . t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a <em>Recent blog posts</em> block that may be enabled at the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/build/block'))) . '</p>';
$output .= '<p>' . t('When using the aggregator module an automatic <em>blog it</em> icon is displayed next to the items in a feed\'s <em>latest items</em> block. Clicking this icon populates a <em>blog entry</em> with a title (the title of the feed item) and body (a link to the source item on its original site and illustrative content suitable for use in a block quote). Blog authors can use this feature to easily comment on items of interest that appear in aggregator feeds from other sites. To use this feature, be sure to <a href="@modules">enable</a> the aggregator module, <a href="@feeds">add and configure</a> a feed from another site, and <a href="@blocks">position</a> the feed\'s <em>latest items</em> block.', array('@modules' => url('admin/build/modules'), '@feeds' => url('admin/content/aggregator'), '@blocks' => url('admin/build/block'))) . '</p>';
@@ -78,7 +78,6 @@ function blog_form(&$node) {
$iid = isset($_GET['iid']) ? (int)$_GET['iid'] : 0;
$type = node_get_types('type', $node);
-
if (empty($node->body)) {
// If the user clicked a "blog it" link, we load the data from the
// database and quote it in the blog.
@@ -91,11 +90,11 @@ function blog_form(&$node) {
// Note: $item->description has been validated on aggregation.
$node->body = '<a href="' . check_url($item->link) . '">' . check_plain($item->title) . '</a> - <em>' . $item->description . '</em> [<a href="' . check_url($item->flink) . '">' . check_plain($item->ftitle) . "</a>]\n";
}
-
}
$form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#required' => TRUE, '#default_value' => !empty($node->title) ? $node->title : NULL, '#weight' => -5);
$form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
+
return $form;
}
@@ -104,9 +103,10 @@ function blog_form(&$node) {
*/
function blog_view($node, $teaser = FALSE, $page = FALSE) {
if ($page) {
- // Breadcrumb navigation
+ // Breadcrumb navigation.
drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("@name's blog", array('@name' => $node->name)), 'blog/' . $node->uid)));
}
+
return node_prepare($node, $teaser);
}
@@ -121,7 +121,7 @@ function blog_link($type, $node = NULL, $teaser = FALSE) {
$links['blog_usernames_blog'] = array(
'title' => t("@username's blog", array('@username' => $node->name)),
'href' => "blog/$node->uid",
- 'attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $node->name)))
+ 'attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $node->name))),
);
}
}
@@ -192,7 +192,7 @@ function blog_block($op = 'list', $delta = '') {
$block['recent']['info'] = t('Recent blog posts');
return $block;
}
- else if ($op == 'view') {
+ elseif ($op == 'view') {
if (user_access('access content')) {
$result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10);
if ($node_title_list = node_title_list($result)) {
diff --git a/modules/blog/blog.pages.inc b/modules/blog/blog.pages.inc
index caa47a207fe0d15d2494a980d2d9e88db0c8bddd..18375167fd668e0844c6d937224a8f9f9a1d9323 100644
--- a/modules/blog/blog.pages.inc
+++ b/modules/blog/blog.pages.inc
@@ -110,6 +110,5 @@ function blog_feed_last() {
while ($row = db_fetch_object($result)) {
$items[] = $row->nid;
}
-
node_feed($items, $channel);
}
diff --git a/modules/blog/blog.test b/modules/blog/blog.test
index 292aa3bd96e41be73373406f515bfc54cf125de5..c9019e9298eb9e457088d35ec291fa8f1dc64fc0 100644
--- a/modules/blog/blog.test
+++ b/modules/blog/blog.test
@@ -60,8 +60,10 @@ class BlogTestCase extends DrupalWebTestCase {
/**
* Run basic tests on the indicated user.
*
- * @param object $user The logged in user.
- * @param boolean $admin User has 'access administration pages' privilege.
+ * @param object $user
+ * The logged in user.
+ * @param boolean $admin
+ * User has 'access administration pages' privilege.
*/
private function doBasicTests($user, $admin) {
// Login the user.
@@ -77,10 +79,14 @@ class BlogTestCase extends DrupalWebTestCase {
/**
* Verify the logged in user has the desired access to the various blog nodes.
*
- * @param object $node_user The user who creates the node.
- * @param object $node Node.
- * @param boolean $admin User has 'access administration pages' privilege.
- * @param integer $response HTTP response code.
+ * @param object $node_user
+ * The user who creates the node.
+ * @param object $node
+ * A node object.
+ * @param boolean $admin
+ * User has 'access administration pages' privilege.
+ * @param integer $response
+ * HTTP response code.
*/
private function verifyBlogs($node_user, $node, $admin, $response = 200) {
$crumb = '›';
@@ -91,11 +97,10 @@ class BlogTestCase extends DrupalWebTestCase {
// View blog help node.
$this->drupalGet('admin/help/blog');
$this->assertResponse($response2);
- // NOTE: The two commented asserts fail because the get returns the 'admin/help' node instead of the indicated node???
if ($response2 == 200) {
-// $this->assertTitle(t('Blog | Drupal'), t('Blog help node was displayed'));
+ $this->assertTitle(t('Blog | Drupal'), t('Blog help node was displayed'));
$this->assertText(t('Blog'), t('Blog help node was displayed'));
-// $this->assertText(t('Home '. $crumb .' Administer '. $crumb .' Help'), t('Breadcrumbs were displayed'));
+ $this->assertText(t('Home '. $crumb .' Administer '. $crumb .' Help'), t('Breadcrumbs were displayed'));
}
// Verify the blog block was displayed.
@@ -135,7 +140,8 @@ class BlogTestCase extends DrupalWebTestCase {
/**
* Verify the blog links are displayed to the logged in user.
*
- * @param object $user The logged in user.
+ * @param object $user
+ * The logged in user.
*/
private function verifyBlogLinks($user) {
$crumb = '›';