From 453a7fc91e75cfa42abf40005ac2f9ef98da6148 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 28 Mar 2017 17:55:35 -0700 Subject: [PATCH] PHP 5.6 fix for sql function queries. --- e107_handlers/admin_ui.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 70144a08e..cfd80f7a6 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -4174,9 +4174,14 @@ class e_admin_controller_ui extends e_admin_controller $pid = $this->getPrimaryName(); $order = $this->getSortField(); - $sql = " - DROP FUNCTION IF EXISTS `getDepth` ; + + $sql = "DROP FUNCTION IF EXISTS `getDepth` ;"; + + e107::getDb()->gen($sql); + + + $sql = " CREATE FUNCTION `getDepth` (project_id INT) RETURNS int BEGIN DECLARE depth INT; @@ -4197,10 +4202,15 @@ class e_admin_controller_ui extends e_admin_controller END ; + "; + e107::getDb()->gen($sql); - DROP FUNCTION IF EXISTS `getTreeSort`; + $sql = "DROP FUNCTION IF EXISTS `getTreeSort`;"; + + e107::getDb()->gen($sql); + $sql = " CREATE FUNCTION getTreeSort(incid INT) RETURNS CHAR(255) BEGIN @@ -4219,7 +4229,6 @@ class e_admin_controller_ui extends e_admin_controller "; - // FIXME - make order work correctly (modify @order) when twin digits or higher are used. e107::getDb()->gen($sql);