Changeset 2243:86b0bd224843
- Timestamp:
- 10/04/13 11:06:08 (10 years ago)
- Branch:
- default
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/comments_actions.php
r2066 r2243 16 16 require dirname(__FILE__).'/../inc/admin/prepend.php'; 17 17 18 if (isset($_REQUEST['redir'])) { 19 $u = explode('?',$_REQUEST['redir']); 20 $uri = $u[0]; 21 if (isset($u[1])) { 22 parse_str($u[1],$args); 23 } 24 $args['redir'] = $_REQUEST['redir']; 25 } else { 26 $uri = 'posts.php'; 27 $args=array(); 28 } 29 18 30 dcPage::check('usage,contentadmin'); 19 31 20 32 $comments_actions_page = new dcCommentsActionsPage($core,'comments.php'); 33 $comments_actions_page->setEnableRedirSelection(false); 21 34 22 35 $comments_actions_page->process(); -
admin/posts_actions.php
r1999 r2243 18 18 dcPage::check('usage,contentadmin'); 19 19 20 $posts_actions_page = new dcPostsActionsPage($core,'posts.php'); 20 if (isset($_REQUEST['redir'])) { 21 $u = explode('?',$_REQUEST['redir']); 22 $uri = $u[0]; 23 if (isset($u[1])) { 24 parse_str($u[1],$args); 25 } 26 $args['redir'] = $_REQUEST['redir']; 27 } else { 28 $uri = 'posts.php'; 29 $args=array(); 30 } 21 31 32 $posts_actions_page = new dcPostsActionsPage($core,$uri,$args); 33 $posts_actions_page->setEnableRedirSelection(false); 22 34 $posts_actions_page->process(); 23 35 -
inc/admin/actions/class.dcaction.php
r2169 r2243 52 52 /** @var boolean true if we are acting inside a plugin (different handling of begin/endpage) */ 53 53 protected $in_plugin; 54 55 /** @var boolean true if we enable to keep selection when redirecting */ 56 protected $enable_redir_selection; 54 57 55 58 /** … … 84 87 $u=explode('?',$_SERVER['REQUEST_URI']); 85 88 $this->in_plugin = (strpos($u[0],'plugin.php') !== false); 89 $this->enable_redir_selection = true; 90 } 91 92 /** 93 * setEnableRedirSelection - define whether to keep selection when redirecting 94 * Can be usefull to be disabled to preserve some compatibility. 95 * 96 * @param boolean $enable true to enable, false otherwise 97 * 98 * @access public 99 */ 100 public function setEnableRedirSelection($enable) { 101 $this->enable_redir_selection = $enable; 86 102 } 87 103 … … 227 243 public function getRedirection($with_selected_entries=false,$params=array()) { 228 244 $redir_args = array_merge($params,$this->redir_args); 229 if ($with_selected_entries) { 245 if (isset($redir_args['redir'])) { 246 unset($redir_args['redir']); 247 } 248 249 if ($with_selected_entries && $this->enable_redir_selection) { 230 250 $redir_args[$this->field_entries] = array_keys($this->entries); 231 251 }
Note: See TracChangeset
for help on using the changeset viewer.