diff --git a/modules/archive.module b/modules/archive.module index b69d4feb1b64a775119fcc730c5a74d82818a2a0..c29546da354ccd8fb562f3f50a2ada334019aa38 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -150,7 +150,7 @@ function archive_calendar($original = 0) { $output .= "\n\n"; - cache_set("archive:calendar:$first", $output, time() + variable_get("cache_clear", 120)); + cache_set("archive:calendar:$start_of_month", $output, time() + variable_get("cache_clear", 120)); return $output; } diff --git a/modules/archive/archive.module b/modules/archive/archive.module index b69d4feb1b64a775119fcc730c5a74d82818a2a0..c29546da354ccd8fb562f3f50a2ada334019aa38 100644 --- a/modules/archive/archive.module +++ b/modules/archive/archive.module @@ -150,7 +150,7 @@ function archive_calendar($original = 0) { $output .= "\n\n"; - cache_set("archive:calendar:$first", $output, time() + variable_get("cache_clear", 120)); + cache_set("archive:calendar:$start_of_month", $output, time() + variable_get("cache_clear", 120)); return $output; } diff --git a/modules/block.module b/modules/block.module index f840679317caba5f773b64762882a6448f107f3f..5ac9d9f59aa6944ef4f0f21109db0ce37a1abe7e 100644 --- a/modules/block.module +++ b/modules/block.module @@ -8,7 +8,7 @@ function block_help() { $output .= "

The path setting lets you define on which pages you want a specific block to be shown. If you leave the path blank it will show on all pages. The path uses a regular expression syntax so remember to escape special characters!

"; $output .= "

In case you should not know what a regular expression is, you should read about them in the PHP manual. The chapter to look at is the one on Perl-Compatible Regular Expressions (PCRE).

"; $output .= "

However, for basic tasks it is sufficient to look at the following examples:

"; - $output .= "

If the block should only show up on blog pages, use <^/blog>. To display on all node views use <^/node/view>. The angular brackets are used as delimiters of the regular expression. The caret indicates the start of the path. To show up on either forum or book pages use <^(/forum|/book)>. The round brackets form a group of expressions, divided by the | character. It matches if any of the expressions in it match. A more complicated example is <^/node/add/(story|blog|image)>. Blocks which have their paths set to this expression will show up on story, block, or image composition pages.

"; + $output .= "

If the block should only show up on blog pages, use </blog>. To display on all node views use </node/view>. The angular brackets are used as delimiters of the regular expression. To show up on either forum or book pages use <(/forum|/book)>. The round brackets form a group of expressions, divided by the | character. It matches if any of the expressions in it match. A more complicated example is </node/add/(story|blog|image)>. Blocks which have their paths set to this expression will show up on story, block, or image composition pages.

"; $output .= "

Custom Blocks

"; $output .= "

A custom block is a block that contains admin-supplied HTML, text or PHP content (as opposed to being generated automatically by a module). Each custom block consists of a title, a description, and a body of text, HTML, or PHP code which can be as long as you wish. The Drupal engine will 'render' the content of the custom block.

"; $output .= "

PHP in custom blocks

"; diff --git a/modules/block/block.module b/modules/block/block.module index f840679317caba5f773b64762882a6448f107f3f..5ac9d9f59aa6944ef4f0f21109db0ce37a1abe7e 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -8,7 +8,7 @@ function block_help() { $output .= "

The path setting lets you define on which pages you want a specific block to be shown. If you leave the path blank it will show on all pages. The path uses a regular expression syntax so remember to escape special characters!

"; $output .= "

In case you should not know what a regular expression is, you should read about them in the PHP manual. The chapter to look at is the one on Perl-Compatible Regular Expressions (PCRE).

"; $output .= "

However, for basic tasks it is sufficient to look at the following examples:

"; - $output .= "

If the block should only show up on blog pages, use <^/blog>. To display on all node views use <^/node/view>. The angular brackets are used as delimiters of the regular expression. The caret indicates the start of the path. To show up on either forum or book pages use <^(/forum|/book)>. The round brackets form a group of expressions, divided by the | character. It matches if any of the expressions in it match. A more complicated example is <^/node/add/(story|blog|image)>. Blocks which have their paths set to this expression will show up on story, block, or image composition pages.

"; + $output .= "

If the block should only show up on blog pages, use </blog>. To display on all node views use </node/view>. The angular brackets are used as delimiters of the regular expression. To show up on either forum or book pages use <(/forum|/book)>. The round brackets form a group of expressions, divided by the | character. It matches if any of the expressions in it match. A more complicated example is </node/add/(story|blog|image)>. Blocks which have their paths set to this expression will show up on story, block, or image composition pages.

"; $output .= "

Custom Blocks

"; $output .= "

A custom block is a block that contains admin-supplied HTML, text or PHP content (as opposed to being generated automatically by a module). Each custom block consists of a title, a description, and a body of text, HTML, or PHP code which can be as long as you wish. The Drupal engine will 'render' the content of the custom block.

"; $output .= "

PHP in custom blocks

";