Sick of it

textpattern · Dec 20, 2019 · cf6ac39 · cf6ac39
1 parent d078d3c
commit cf6ac39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/textpattern/include/txp_section.php b/textpattern/include/txp_section.php
@@ -51,10 +51,11 @@
         'section_multi_edit'    => true,
         'section_set_default'   => true,
         'section_set_theme'     => true,
+        'section_select_skin'   => false,
         'section_toggle_option' => true,
     );
 
-    if ($step && bouncer($step, $available_steps)) {
+    if ($step && is_callable($step) && bouncer($step, $available_steps)) {
         $step();
     } else {
         sec_section_list();
@@ -71,7 +72,7 @@
 
 function sec_section_list($message = '')
 {
-    global $event, $all_pages, $all_styles;
+    global $event, $step, $all_pages, $all_styles;
 
     pagetop(gTxt('tab_sections'), $message);
 
@@ -206,7 +207,7 @@ function sec_section_list($message = '')
     }
 
     $paginator = new \Textpattern\Admin\Paginator();
-    $limit = gps('skin') ? PHP_INT_MAX : $paginator->getLimit();
+    $limit = $step == 'section_select_skin' ? PHP_INT_MAX : $paginator->getLimit();
 
     list($page, $offset, $numPages) = pager($total, $limit, $page);
 
@@ -912,7 +913,7 @@ function section_multiedit_form($page, $sort, $dir, $crit, $search_method, $disa
 var style_sel = '';
 EOJS;
 
-    if (gps('skin')) {
+    if ($step == 'section_select_skin') {
         $script .= <<<EOJS
 $(function() {
     $('#select_all').click();

diff --git a/textpattern/vendors/Textpattern/Skin/Skin.php b/textpattern/vendors/Textpattern/Skin/Skin.php
@@ -1365,7 +1365,7 @@ protected function getContentBlock($data)
                     .hCell(
                         href(txpspecialchars($skin_name), $editUrl, array('title' => gTxt('edit'))).
                         ' | '.
-                        href(gTxt('assign_sections'), 'index.php?event=section&skin='.urlencode($skin_name)).
+                        href(gTxt('assign_sections'), 'index.php?event=section&step=section_select_skin&skin='.urlencode($skin_name)).
                         (${$event.'_section_count'} > 0 ? sp.tag(gTxt('status_in_use'), 'small', array('class' => 'alert-block alert-pill success')) : '')
                         , '', array(
                             'scope' => 'row',