Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Fix by darix: fixed content type settings broken by berkes' last patch.

4.7.x
Dries Buytaert 2005-07-07 13:30:50 +00:00
parent 2c2d981e86
commit 73010a5215
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/node.module
View File

@ -693,7 +693,7 @@ function node_menu($may_cache) {
} }
} }
else if (arg(0) == 'admin' && arg(1) == 'node' && arg(2) == 'configure' && arg(3) == 'types' && is_string(arg(4))) { else if (arg(0) == 'admin' && arg(1) == 'node' && arg(2) == 'configure' && arg(3) == 'types' && is_string(arg(4))) {
$items[] = array('path' => 'admin/node/configure/types/'. arg(4), $items[] = array('path' => 'admin/settings/content-types/'. arg(4),
'title' => t("'%name' content type", array('%name' => node_invoke(arg(4), 'node_name'))), 'title' => t("'%name' content type", array('%name' => node_invoke(arg(4), 'node_name'))),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
} }
@ -931,7 +931,7 @@ function node_types_configure($type = NULL) {
if (isset($type)) { if (isset($type)) {
// Go to the listing page when we submit this form, system_settings_save() calls drupal_goto(). // Go to the listing page when we submit this form, system_settings_save() calls drupal_goto().
if ($_POST['op']) { if ($_POST['op']) {
$_GET['q'] = 'admin/node/configure/types'; $_GET['q'] = 'admin/settings/content-types';
$options = 'options_'. $type; $options = 'options_'. $type;
if (empty($node->$options)) { if (empty($node->$options)) {
$node->$options = array(); $node->$options = array();
@ -953,7 +953,7 @@ function node_types_configure($type = NULL) {
$rows = array(); $rows = array();
foreach (node_list() as $type) { foreach (node_list() as $type) {
$rows[] = array(node_invoke($type, 'node_name'), l(t('configure'), 'admin/node/configure/types/'. $type)); $rows[] = array(node_invoke($type, 'node_name'), l(t('configure'), 'admin/settings/content-types/'. $type));
} }
return theme('table', $header, $rows); return theme('table', $header, $rows);

6
modules/node/node.module
View File

@ -693,7 +693,7 @@ function node_menu($may_cache) {
} }
} }
else if (arg(0) == 'admin' && arg(1) == 'node' && arg(2) == 'configure' && arg(3) == 'types' && is_string(arg(4))) { else if (arg(0) == 'admin' && arg(1) == 'node' && arg(2) == 'configure' && arg(3) == 'types' && is_string(arg(4))) {
$items[] = array('path' => 'admin/node/configure/types/'. arg(4), $items[] = array('path' => 'admin/settings/content-types/'. arg(4),
'title' => t("'%name' content type", array('%name' => node_invoke(arg(4), 'node_name'))), 'title' => t("'%name' content type", array('%name' => node_invoke(arg(4), 'node_name'))),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
} }
@ -931,7 +931,7 @@ function node_types_configure($type = NULL) {
if (isset($type)) { if (isset($type)) {
// Go to the listing page when we submit this form, system_settings_save() calls drupal_goto(). // Go to the listing page when we submit this form, system_settings_save() calls drupal_goto().
if ($_POST['op']) { if ($_POST['op']) {
$_GET['q'] = 'admin/node/configure/types'; $_GET['q'] = 'admin/settings/content-types';
$options = 'options_'. $type; $options = 'options_'. $type;
if (empty($node->$options)) { if (empty($node->$options)) {
$node->$options = array(); $node->$options = array();
@ -953,7 +953,7 @@ function node_types_configure($type = NULL) {
$rows = array(); $rows = array();
foreach (node_list() as $type) { foreach (node_list() as $type) {
$rows[] = array(node_invoke($type, 'node_name'), l(t('configure'), 'admin/node/configure/types/'. $type)); $rows[] = array(node_invoke($type, 'node_name'), l(t('configure'), 'admin/settings/content-types/'. $type));
} }
return theme('table', $header, $rows); return theme('table', $header, $rows);