Changeset 1975 for trunk/admin

Timestamp:

Apr 24, 2007, 1:50:39 AM (17 years ago)

Author:

rvelices

Message:

merge revision 1974 from branch-1_7 to trunk

File:

• trunk/admin/permalinks.php (modified) (5 diffs)

trunk/admin/permalinks.php

@@ -27 +27 @@
     $sortable_by, $default_field,
     $get_param, $get_rejects,
-    $template_var )
+    $template_var,
+    $anchor = '' )
 {
   global $template;
@@ -67 +68 @@
     {
       $template->assign_var( $template_var.strtoupper($field),
-            '<a href="'.$url.'" title="'.l10n('Sort order').'">'.$disp.'</a>'
+            '<a href="'.$url.$anchor.'" title="'.l10n('Sort order').'">'.$disp.'</a>'
          );
     }
@@ -79 +80 @@
 
 $selected_cat = array();
-if ( isset($_POST['set_permalink']) and $_POST['cat_id']>0 )
+if ( isset($_POST['set_permalink']) and $_POST['cat_id']>0 and !is_adviser() )
 {
   $permalink = $_POST['permalink'];
@@ -88 +89 @@
   $selected_cat = array( $_POST['cat_id'] );
 }
-elseif ( isset($_GET['delete_permanent']) )
+elseif ( isset($_GET['delete_permanent']) and !is_adviser() )
 {
   $query = '
@@ -154 +155 @@
     'dpsf',
     array('delete_permanent'),
-    'SORT_OLD_' );
+    'SORT_OLD_', '#old_permalinks' );
 
 $url_del_base = get_root_url().'admin.php?page=permalinks';