mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 21:02:09 +02:00
Code Issues Releases Wiki Activity

XUP (Social Login) fixes in usersettings form. Banner menu query corrected.

Browse Source
This commit is contained in:
Cameron
2016-03-14 03:03:56 -07:00
parent fa8f25dfc5
commit 238c7b0bac
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_plugins/banner/banner_menu.php
View File

@@ -106,13 +106,25 @@ if(!empty($menu_pref['banner_campaign']) && !empty($menu_pref['banner_amount']))
// $query .= ($parm ? " AND banner_campaign='".$tp->toDB($parm)."'" : '');
$query .= " AND banner_active IN (".USERCLASS_LIST.") ";
$query .= " ORDER BY ";
$ord = array();
if($tags = e107::getRegistry('core/form/related'))
{
$tags_regexp = "'(^|,)(".str_replace(",", "|", $tags).")(,|$)'";
$query .= " AND banner_keywords REGEXP ".$tags_regexp;
$ord[] = " banner_keywords REGEXP ".$tags_regexp." DESC";
}
$query .= " AND banner_active IN (".USERCLASS_LIST.") ORDER BY RAND($seed) LIMIT ".intval($menu_pref['banner_amount']);
$ord[] = " RAND($seed) ASC";
$query .= implode(', ',$ord);
$query .= " LIMIT ".intval($menu_pref['banner_amount']);
if($data = $sql->retrieve('banner', 'banner_id, banner_image, banner_clickurl,banner_campaign, banner_description', $query,true))
{