Fix EZP-30718: Allow RerunURL to be used on hidden pages (#1435)

(cherry picked from commit a8d24e4)
ezsystems · Aug 9, 2019 · 432f70b · 432f70b
1 parent 50b81a9
commit 432f70b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/kernel/layout/set.php b/kernel/layout/set.php
@@ -17,7 +17,6 @@
 
 $Result = array();
 $Result['content'] = '';
-$Result['rerun_uri'] = '/' . implode( '/', array_splice( $Params['Parameters'], 1 ) ) . $userParamString;
 
 $layoutINI = eZINI::instance( 'layout.ini' );
 $i18nINI = eZINI::instance( 'i18n.ini' );
@@ -53,6 +52,7 @@
         }
     }
 
+    $Result['rerun_uri'] = '/' . implode( '/', array_splice( $Params['Parameters'], 1 ) ) . $userParamString;
     $Module->setExitStatus( eZModule::STATUS_RERUN );
 }
 else

diff --git a/kernel/private/classes/ezpkernelweb.php b/kernel/private/classes/ezpkernelweb.php
@@ -843,15 +843,14 @@ protected function dispatchLoop()
                 $moduleResult = $this->module->handleError( eZError::KERNEL_MODULE_DISABLED, 'kernel', array( 'check' => $moduleCheck ) );
             }
             $this->siteBasics['module-run-required'] = false;
-            if ( $this->module->exitStatus() == eZModule::STATUS_RERUN )
+            if ( isset( $moduleResult['rerun_uri'] ) )
             {
-                if ( isset( $moduleResult['rerun_uri'] ) )
-                {
-                    $this->uri = eZURI::instance( $moduleResult['rerun_uri'] );
-                    $this->siteBasics['module-run-required'] = true;
-                }
-                else
-                    eZDebug::writeError( 'No rerun URI specified, cannot continue', 'index.php' );
+                $this->uri = eZURI::instance( $moduleResult['rerun_uri'] );
+                $this->siteBasics['module-run-required'] = true;
+            }
+            else if ( $this->module->exitStatus() == eZModule::STATUS_RERUN )
+            {
+                eZDebug::writeError( 'No rerun URI specified on eZModule::STATUS_RERUN, cannot set URI', 'index.php' );
             }
 
             if ( is_array( $moduleResult ) )