From 179f4840a854dea9e728f577db31bb3487545b6f Mon Sep 17 00:00:00 2001 From: "Harry G. Coin" Date: Mon, 25 Apr 2016 20:44:30 -0500 Subject: [PATCH] include omitted column name, partial fix to support mariadb 10.1. --- app/extensions/extensions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index 7f5b0f38e7..f8f8167190 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -64,7 +64,7 @@ require_once "resources/paging.php"; $sql = "select "; $sql .= "(select count(*) from v_extensions where domain_uuid = '".$_SESSION['domain_uuid']."') as num_rows "; if ($db_type == "pgsql") { - $sql .= ",(select count(*) from v_extensions "; + $sql .= ",(select count(*) as count from v_extensions "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "and extension ~ '^[0-9]+$') as numeric_extensions"; } @@ -73,7 +73,7 @@ require_once "resources/paging.php"; $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); $total_extensions = $row['num_rows']; - if ($db_type == "pgsql") { + if (($db_type == "pgsql") or ($db_type == "mysql")) { $numeric_extensions = $row['numeric_extensions']; } }