Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ezsystems/ezpublish-legacy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cbf82b342307849d50ea75028fe4e46a37afffe2
Choose a base ref
..
head repository: ezsystems/ezpublish-legacy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0285e784c21fdfee589326817eb415ae30caf7cc
Choose a head ref
Showing with 5 additions and 2 deletions.
  1. +1 −2 kernel/layout/set.php
  2. +4 −0 kernel/private/classes/ezpkernelweb.php
3 changes: 1 addition & 2 deletions kernel/layout/set.php
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@

$Result = array();
$Result['content'] = '';
$rerunURL = '/' . implode( '/', array_splice( $Params['Parameters'], 1 ) ) . $userParamString;

$layoutINI = eZINI::instance( 'layout.ini' );
$i18nINI = eZINI::instance( 'i18n.ini' );
@@ -53,7 +52,7 @@
}
}

$Result['rerun_uri'] = $rerunURL;
$Result['rerun_uri'] = '/' . implode( '/', array_splice( $Params['Parameters'], 1 ) ) . $userParamString;
$Module->setExitStatus( eZModule::STATUS_RERUN );
}
else
4 changes: 4 additions & 0 deletions kernel/private/classes/ezpkernelweb.php
View file
Original file line number Diff line number Diff line change
@@ -848,6 +848,10 @@ protected function dispatchLoop()
$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 ) )
{