? modules/devel
? modules/color/images/Thumbs.db
? includes/database.mssql.inc
? includes/install.mssql.inc
Index: modules/aggregator/aggregator.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.css,v
retrieving revision 1.1
diff -u -r1.1 aggregator.css
--- modules/aggregator/aggregator.css 14 Aug 2006 07:14:48 -0000 1.1
+++ modules/aggregator/aggregator.css 28 Nov 2006 23:10:42 -0000
@@ -1,4 +1,4 @@
-/* $Id: aggregator.css,v 1.1 2006/08/14 07:14:48 drumm Exp $ */
+/* $Id: aggregator.css,v 1.1 2006/11/28 23:10:42 souvent22 Exp $ */
#aggregator .feed-source .feed-title {
margin-top: 0;
Index: modules/aggregator/aggregator.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.info,v
retrieving revision 1.3
diff -u -r1.3 aggregator.info
--- modules/aggregator/aggregator.info 21 Nov 2006 20:55:33 -0000 1.3
+++ modules/aggregator/aggregator.info 28 Nov 2006 23:10:42 -0000
@@ -1,4 +1,4 @@
-; $Id: aggregator.info,v 1.3 2006/11/21 20:55:33 dries Exp $
+; $Id: aggregator.info,v 1.1 2006/11/28 23:10:42 souvent22 Exp $
name = Aggregator
description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
package = Core - optional
Index: modules/aggregator/aggregator.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v
retrieving revision 1.8
diff -u -r1.8 aggregator.install
--- modules/aggregator/aggregator.install 26 Sep 2006 14:19:00 -0000 1.8
+++ modules/aggregator/aggregator.install 29 Nov 2006 17:35:17 -0000
@@ -1,5 +1,5 @@
title);
$result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
- $read_more = '
'. l(t('more'), 'aggregator/sources/'. $feed->fid, array('title' => t("View this feed's recent news."))) .'
';
+ $block['content'] = ''. l(t('more'), 'aggregator/sources/'. $feed->fid, array('title' => t("View this feed's recent news."))) .'
';
}
break;
@@ -293,7 +293,7 @@
if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) {
$block['subject'] = check_plain($category->title);
$result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = %d ORDER BY i.timestamp DESC, i.iid DESC', $category->cid, 0, $category->block);
- $read_more = ''. l(t('more'), 'aggregator/categories/'. $category->cid, array('title' => t("View this category's recent news."))) .'
';
+ $block['content'] = ''. l(t('more'), 'aggregator/categories/'. $category->cid, array('title' => t("View this category's recent news."))) .'
';
}
break;
}
@@ -301,11 +301,7 @@
while ($item = db_fetch_object($result)) {
$items[] = theme('aggregator_block_item', $item);
}
-
- // Only display the block if there are items to show.
- if (count($items) > 0) {
- $block['content'] = theme('item_list', $items) . $read_more;
- }
+ $block['content'] = theme('item_list', $items) . $block['content'];
}
return $block;
}
@@ -978,7 +974,7 @@
function aggregator_view() {
$result = db_query('SELECT f.*, COUNT(i.iid) AS items FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.etag, f.modified, f.image, f.block ORDER BY f.title');
- $output = ''. t('Feed overview') .'
';
+ $output .= ''. t('Feed overview') .'
';
$header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3'));
$rows = array();
Index: modules/block/block.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.css,v
retrieving revision 1.1
diff -u -r1.1 block.css
--- modules/block/block.css 14 Aug 2006 07:14:49 -0000 1.1
+++ modules/block/block.css 28 Nov 2006 23:10:43 -0000
@@ -1,4 +1,4 @@
-/* $Id: block.css,v 1.1 2006/08/14 07:14:49 drumm Exp $ */
+/* $Id: block.css,v 1.1 2006/11/28 23:10:43 souvent22 Exp $ */
#blocks td.region {
font-weight: bold;
Index: modules/block/block.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.info,v
retrieving revision 1.3
diff -u -r1.3 block.info
--- modules/block/block.info 21 Nov 2006 20:55:33 -0000 1.3
+++ modules/block/block.info 28 Nov 2006 23:10:43 -0000
@@ -1,4 +1,4 @@
-; $Id: block.info,v 1.3 2006/11/21 20:55:33 dries Exp $
+; $Id: block.info,v 1.1 2006/11/28 23:10:43 souvent22 Exp $
name = Block
description = Controls the boxes that are displayed around the main content.
package = Core - required
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.240
diff -u -r1.240 block.module
--- modules/block/block.module 28 Nov 2006 11:12:38 -0000 1.240
+++ modules/block/block.module 29 Nov 2006 17:24:35 -0000
@@ -1,5 +1,5 @@
roles)));
+ $result = db_query("SELECT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.status = 1 AND b.custom != 0 AND (r.rid IN (%s) OR r.rid IS NULL) ORDER BY b.weight, b.module", implode(',', array_keys($user->roles)));
$form['block'] = array('#type' => 'fieldset', '#title' => t('Block configuration'), '#weight' => 3, '#collapsible' => TRUE, '#tree' => TRUE);
while ($block = db_fetch_object($result)) {
$data = module_invoke($block->module, 'block', 'list');
@@ -641,7 +641,7 @@
static $blocks = array();
if (!count($blocks)) {
- $result = db_query("SELECT DISTINCT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.theme = '%s' AND b.status = 1 AND (r.rid IN (%s) OR r.rid IS NULL) ORDER BY b.region, b.weight, b.module", $theme_key, implode(',', array_keys($user->roles)));
+ $result = db_query("SELECT b.* FROM {blocks} b LEFT JOIN {blocks_roles} r ON b.module = r.module AND b.delta = r.delta WHERE b.theme = '%s' AND b.status = 1 AND (r.rid IN (%s) OR r.rid IS NULL) ORDER BY b.region, b.weight, b.module", $theme_key, implode(',', array_keys($user->roles)));
while ($block = db_fetch_object($result)) {
if (!isset($blocks[$block->region])) {
$blocks[$block->region] = array();
Index: modules/blog/blog.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.info,v
retrieving revision 1.3
diff -u -r1.3 blog.info
--- modules/blog/blog.info 21 Nov 2006 20:55:33 -0000 1.3
+++ modules/blog/blog.info 28 Nov 2006 23:10:43 -0000
@@ -1,4 +1,4 @@
-; $Id: blog.info,v 1.3 2006/11/21 20:55:33 dries Exp $
+; $Id: blog.info,v 1.1 2006/11/28 23:10:43 souvent22 Exp $
name = Blog
description = Enables keeping an easily and regularly updated web page or a blog.
package = Core - optional
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.270
diff -u -r1.270 blog.module
--- modules/blog/blog.module 23 Nov 2006 11:06:53 -0000 1.270
+++ modules/blog/blog.module 28 Nov 2006 23:10:43 -0000
@@ -1,5 +1,5 @@