1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00

Fixes #4203 Fatal error Object of class core_index_index_controller could not be converted to string under PHP 7.4.7

This commit is contained in:
Cameron
2020-06-27 13:12:04 -07:00
parent a6a98a82ad
commit 84d3c29e42

View File

@@ -23,6 +23,7 @@ class core_index_index_controller extends eController
* - http://mysite.com/news.php?extend.2 (redirect) * - http://mysite.com/news.php?extend.2 (redirect)
* - http://mysite.com/Blog/My Blog Title.html (redirect) * - http://mysite.com/Blog/My Blog Title.html (redirect)
* - http://NotMysite.com/someurl/ (redirect) - really not sure who'd need that... * - http://NotMysite.com/someurl/ (redirect) - really not sure who'd need that...
* @throws eException
*/ */
public function actionIndex() public function actionIndex()
{ {
@@ -66,9 +67,9 @@ class core_index_index_controller extends eController
elseif (USER) elseif (USER)
{ // This is the key bit - what to do for a 'normal' logged in user { // This is the key bit - what to do for a 'normal' logged in user
// We have USERCLASS_LIST - comma separated. Also e_CLASS_REGEXP // We have USERCLASS_LIST - comma separated. Also e_CLASS_REGEXP
$inclass = false;
foreach ($class_list as $fp_class) foreach ($class_list as $fp_class)
{ {
$inclass = false;
if (!$inclass && check_class($fp_class['userclass_id'])) if (!$inclass && check_class($fp_class['userclass_id']))
{ {
$location = $pref['frontpage'][$fp_class['userclass_id']]; $location = $pref['frontpage'][$fp_class['userclass_id']];
@@ -85,7 +86,7 @@ class core_index_index_controller extends eController
$location = trim($location); $location = trim($location);
$request = $this->getRequest(); $request = $this->getRequest();
// Defaults to news // Defaults to news
if(!$location) $location = 'url:/news'; if(!$location) $location = 'url:/news';
// Former Welcome Message front-page. Should be handled by current theme layout // Former Welcome Message front-page. Should be handled by current theme layout
@@ -159,7 +160,7 @@ class core_index_index_controller extends eController
$request->routed = true; $request->routed = true;
define('e_FRONTPAGE', true); define('e_FRONTPAGE', true);
eFront::isLegacy('{e_BASE}'.$page); eFront::isLegacy('{e_BASE}'.$page);
return $this; return;
} }
// Redirect // Redirect
else else