Merge remote-tracking branch 'football/master'
# Conflicts: # acp/matches_module.php # adm/style/acp_football_leagues.html # adm/style/acp_football_matches.html # block/all_bets.php # block/rank_matchday.php # block/ranks_total.php # config/services.yml # controller/main.php # event/main_listener.php # includes/constants.php # includes/functions.php # language/de/football.php # language/de/info_acp_leagues.php # language/de/info_acp_matches.php # styles/prosilver/template/all_bets.html # styles/prosilver/template/results.html # styles/prosilver/template/table.html # styles/prosilver/theme/football.css
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
|
||||
if (!defined('IN_PHPBB'))
|
||||
{
|
||||
exit;
|
||||
}
|
||||
@@ -159,7 +159,7 @@ foreach($points_ary as $group_id => $points)
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$db->sql_freeresult($result);
|
||||
@@ -458,9 +458,13 @@ if($league > 50)
|
||||
{
|
||||
// Activate bonus coloumn only for tippers.
|
||||
$data_bns = true;
|
||||
} else {
|
||||
$data_bns = false;
|
||||
}
|
||||
if($side == 'table') {
|
||||
$display_table_menu = true;
|
||||
} else {
|
||||
$display_table_menu = false;
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
$sidename = sprintf($user->lang['TABLE']);
|
||||
@@ -476,5 +480,3 @@ $template->assign_vars(array(
|
||||
'S_DATA_BNS' => $data_bns,
|
||||
)
|
||||
);
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user