mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 05:07:27 +02:00
Code Issues Releases Wiki Activity

Fixes #1782 - Menu-Manager list not populating when 'ONLY_FULL_GROUP_BY' is in sql-mode. Active SQL Modes added to the PHPInfo page.

Browse Source
This commit is contained in:
Cameron
2016-08-06 10:52:11 -07:00
parent 2df263a2b2
commit dfd6f9ea13
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1059,6 +1059,8 @@ class admin_shortcodes
$text .= $themeinfo ? "<br />".FOOTLAN_7.": ".$themeinfo : ''; $text .= $themeinfo ? "<br />".FOOTLAN_7.": ".$themeinfo : '';
$sqlMode = str_replace(",", ", ",e107::getDB()->getMode());
$text .= "<br /><br /> $text .= "<br /><br />
<b>".FOOTLAN_8."</b> <b>".FOOTLAN_8."</b>
<br /> <br />
@@ -1075,8 +1077,9 @@ class admin_shortcodes
<b>".FOOTLAN_12."</b> <b>".FOOTLAN_12."</b>
<br /> <br />
".e107::getDB()->getServerInfo(). // mySqlServerInfo. ".e107::getDB()->getServerInfo(). // mySqlServerInfo.
"<br />
".FOOTLAN_16.": ".$mySQLdefaultdb." "<br />".FOOTLAN_16.": ".$mySQLdefaultdb."
<br />Mode: <small>".$sqlMode."</small>
<br /><br /> <br /><br />
<b>".FOOTLAN_17."</b> <b>".FOOTLAN_17."</b>
<br />utf-8 <br />utf-8

12
e107_handlers/menumanager_class.php
View File

@@ -1122,10 +1122,20 @@ class e_menuManager {
$pageMenu = array(); $pageMenu = array();
$pluginMenu = array(); $pluginMenu = array();
$done = array();
$sql->select("menus", "menu_name, menu_id, menu_pages, menu_path", "1 GROUP BY menu_name ORDER BY menu_name ASC"); $sql->select("menus", "menu_name, menu_id, menu_pages, menu_path", "1 ORDER BY menu_name ASC");
while ($row = $sql->fetch()) while ($row = $sql->fetch())
{ {
if(in_array($row['menu_name'],$done))
{
continue;
}
$done[] = $row['menu_name'];
if(is_numeric($row['menu_path'])) if(is_numeric($row['menu_path']))
{ {
$pageMenu[] = $row; $pageMenu[] = $row;