Commit 08e7c8b3 authored by Dries's avatar Dries
Browse files

- Patch #16246 by Moshe: "Here is a patch for node.module since thta hunk...

- Patch #16246 by Moshe: "Here is a patch for node.module since thta hunk failed last time. Note that I've removed the 'delete' link since it doesn't work and is mostly obsolete with the 'mass delete' feature.  I've also added smart destination andling to the 'url alias delete' feature."
parent 16993da3
......@@ -924,14 +924,14 @@ function node_admin_nodes() {
// Overview table:
$header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), array('data' => t('Operations'), 'colspan' => '2'));
$destination = drupal_get_destination();
while ($node = db_fetch_object($result)) {
$rows[] = array(form_checkbox(NULL, 'nodes]['. $node->nid, 1, 0),
l($node->title, 'node/'. $node->nid) .' '. theme('mark', node_mark($node->nid, $node->changed)),
node_invoke($node, 'node_name'),
format_name($node),
($node->status ? t('published') : t('not published')),
l(t('edit'), 'node/'. $node->nid .'/edit'),
l(t('delete'), 'admin/node/delete/'. $node->nid));
l(t('edit'), 'node/'. $node->nid .'/edit', array(), $destination));
}
if ($pager = theme('pager', NULL, 50, 0)) {
......
......@@ -924,14 +924,14 @@ function node_admin_nodes() {
// Overview table:
$header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), array('data' => t('Operations'), 'colspan' => '2'));
$destination = drupal_get_destination();
while ($node = db_fetch_object($result)) {
$rows[] = array(form_checkbox(NULL, 'nodes]['. $node->nid, 1, 0),
l($node->title, 'node/'. $node->nid) .' '. theme('mark', node_mark($node->nid, $node->changed)),
node_invoke($node, 'node_name'),
format_name($node),
($node->status ? t('published') : t('not published')),
l(t('edit'), 'node/'. $node->nid .'/edit'),
l(t('delete'), 'admin/node/delete/'. $node->nid));
l(t('edit'), 'node/'. $node->nid .'/edit', array(), $destination));
}
if ($pager = theme('pager', NULL, 50, 0)) {
......
......@@ -266,7 +266,7 @@ function path_overview() {
$destination = drupal_get_destination();
while ($data = db_fetch_object($result)) {
$rows[] = array($data->dst, $data->src, l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid"));
$rows[] = array($data->dst, $data->src, l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid", array(), $destination));
}
if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) {
......
......@@ -266,7 +266,7 @@ function path_overview() {
$destination = drupal_get_destination();
while ($data = db_fetch_object($result)) {
$rows[] = array($data->dst, $data->src, l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid"));
$rows[] = array($data->dst, $data->src, l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid", array(), $destination));
}
if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment