? .project
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/field/field.info.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.info.inc,v
retrieving revision 1.24
diff -u -p -r1.24 field.info.inc
--- modules/field/field.info.inc 16 Oct 2009 02:47:16 -0000 1.24
+++ modules/field/field.info.inc 18 Oct 2009 20:47:19 -0000
@@ -191,7 +191,7 @@ function _field_info_collate_types($rese
* both deleted and non-deleted fields. The bundles element is the same as
* for 'fields'.
* - instances: Array of existing instances, keyed by object type, bundle
- * name and field name. This entry only lists non-deleted instances.
+ * name and field name. This entry only lists non-deleted instances.
*/
function _field_info_collate_fields($reset = FALSE) {
static $info;
Index: modules/field_ui/field_ui.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.admin.inc,v
retrieving revision 1.23
diff -u -p -r1.23 field_ui.admin.inc
--- modules/field_ui/field_ui.admin.inc 15 Oct 2009 12:44:35 -0000 1.23
+++ modules/field_ui/field_ui.admin.inc 18 Oct 2009 20:47:22 -0000
@@ -837,7 +837,7 @@ function field_ui_field_settings_form($f
'#options' => array(TRUE => t('Translatable field'), FALSE => t('Language neutral field')),
'#default_value' => $field['translatable'],
'#description' => t("Translatable fields can have a different value for each available language. An example of a translatable field is an article's body. Language neutral fields will retain the same value across all translations. An example of a language neutral field is a user profile's first name."),
- );
+ );
// Add settings provided by the field module. The field module is
// responsible for not returning settings that cannot be changed if
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.98
diff -u -p -r1.98 content_types.inc
--- modules/node/content_types.inc 16 Oct 2009 13:20:16 -0000 1.98
+++ modules/node/content_types.inc 18 Oct 2009 20:47:23 -0000
@@ -18,14 +18,13 @@ function node_overview_types() {
foreach ($names as $key => $name) {
$type = $types[$key];
if (node_hook($type->type, 'form')) {
- $type_url_str = str_replace('_', '-', $type->type);
$row = array(theme('node_admin_overview', array('name' => $name, 'type' => $type)));
// Set the edit column.
- $row[] = array('data' => l(t('edit'), 'admin/structure/types/manage/' . $type_url_str));
+ $row[] = array('data' => l(t('edit'), 'admin/structure/types/manage/' . $type->type));
// Set the delete column.
if ($type->custom) {
- $row[] = array('data' => l(t('delete'), 'admin/structure/types/manage/' . $type_url_str . '/delete'));
+ $row[] = array('data' => l(t('delete'), 'admin/structure/types/manage/' . $type->type . '/delete'));
}
else {
$row[] = array('data' => '');
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1150
diff -u -p -r1.1150 node.module
--- modules/node/node.module 17 Oct 2009 05:50:29 -0000 1.1150
+++ modules/node/node.module 18 Oct 2009 20:47:27 -0000
@@ -200,7 +200,7 @@ function node_entity_info() {
'label' => $name,
'admin' => array(
'path' => 'admin/structure/types/manage/%node_type',
- 'real path' => 'admin/structure/types/manage/' . str_replace('_', '-', $type),
+ 'real path' => 'admin/structure/types/manage/' . $type,
'bundle argument' => 4,
'access arguments' => array('administer content types'),
),
@@ -1106,7 +1106,7 @@ function node_build($node, $build_mode =
$build = $node->content;
// We don't need duplicate rendering info in node->content.
unset($node->content);
-
+
$build += array(
'#theme' => 'node',
'#node' => $node,
@@ -1281,7 +1281,7 @@ function template_preprocess_node(&$vari
// Flatten the node object's member fields.
$variables = array_merge((array)$node, $variables);
-
+
// Helpful $content variable for templates.
foreach (element_children($variables['elements']) as $key) {
$variables['content'][$key] = $variables['elements'][$key];
@@ -1455,7 +1455,7 @@ function node_search_admin() {
$form['content_ranking']['info'] = array(
'#value' => '' . t('The following numbers control which properties the content search should favor when ordering the results. Higher numbers mean more influence, zero means the property is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . ''
);
-
+
// Note: reversed to reflect that higher number = higher ranking.
$options = drupal_map_assoc(range(0, 10));
foreach (module_invoke_all('ranking') as $var => $values) {
@@ -1480,7 +1480,7 @@ function node_search_execute($keys = NUL
->condition('n.status', 1)
->addTag('node_access')
->searchExpression($keys, 'node');
-
+
// Insert special keywords.
$query->setOption('type', 'n.type');
$query->setOption('language', 'n.language');
@@ -1491,10 +1491,10 @@ function node_search_execute($keys = NUL
if (!$query->executeFirstPass()) {
return array();
}
-
+
// Add the ranking expressions.
_node_rankings($query);
-
+
// Add a count query.
$inner_query = clone $query;
$count_query = db_select($inner_query->fields('i', array('sid')));
@@ -1503,7 +1503,7 @@ function node_search_execute($keys = NUL
$find = $query
->limit(10)
->execute();
-
+
// Load results.
$results = array();
foreach ($find as $item) {
@@ -1511,14 +1511,14 @@ function node_search_execute($keys = NUL
$node = node_load($item->sid);
node_build_content($node, 'search_result');
$node->rendered = drupal_render($node->content);
-
+
// Fetch comments for snippet.
$node->rendered .= ' ' . module_invoke('comment', 'node_update_index', $node);
// Fetch terms for snippet.
$node->rendered .= ' ' . module_invoke('taxonomy', 'node_update_index', $node);
-
+
$extra = module_invoke_all('node_search_result', $node);
-
+
$results[] = array(
'link' => url('node/' . $item->sid, array('absolute' => TRUE)),
'type' => check_plain(node_type_get_name($node)),