diff --git a/block/rank_matchday.php b/block/rank_matchday.php index 1392800..700cf45 100644 --- a/block/rank_matchday.php +++ b/block/rank_matchday.php @@ -12,6 +12,15 @@ if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL')) exit; } +if ($league > 50) +{ + $league_corr = $league - 50; +} +else +{ + $league_corr = $league; +} + if ($league <> 0) { $data_rank_matchday = false; @@ -26,7 +35,7 @@ if ($league <> 0) FROM " . FOOTB_RANKS . ' AS r LEFT Join ' . USERS_TABLE . " AS u ON (r.user_id = u.user_id) WHERE r.season = $season - AND r.league = $league + AND r.league = $league_corr AND r.matchday = $matchday AND r.status IN (2,3) ORDER BY rank ASC, LOWER(u.username) ASC"; @@ -50,7 +59,7 @@ if ($league <> 0) 'ROW_CLASS' => $row_class, 'USERID' => $row['user_id'], 'USERNAME' => $row['username'], - 'U_BET_USER' => $this->helper->route('football_football_popup', array('popside' => 'bet_popup', 's' => $season, 'l' => $league, + 'U_BET_USER' => $this->helper->route('football_football_popup', array('popside' => 'bet_popup', 's' => $season, 'l' => $league_corr, 'm' => $matchday, 'u' => $row['user_id'])), 'POINTS' => $row['points'], 'COLOR_STYLE' => $colorstyle, @@ -60,7 +69,7 @@ if ($league <> 0) } } $db->sql_freeresult($result); - $league_info = league_info($season, $league); + $league_info = league_info($season, $league_corr); $template->assign_vars(array( 'S_DISPLAY_RANK_MATCHDAY' => true, diff --git a/controller/main.php b/controller/main.php index c9f808a..5a87053 100644 --- a/controller/main.php +++ b/controller/main.php @@ -932,7 +932,6 @@ class main { include($this->football_root_path . 'block/table.' . $this->php_ext); } - elseif ($league > 50) {/* do nothing */} else { include($this->football_root_path . 'block/rank_matchday.' . $this->php_ext);