A few changes from the merge.

This commit is contained in:
Mark Crane
2013-01-20 01:13:19 +00:00
parent 2be81da122
commit d1faa30d41
8 changed files with 10 additions and 18 deletions

View File

@@ -441,10 +441,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo "</table>";
echo "<br />\n";
$sql = " select * from v_dialplan_details ";
$sql .= " where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= " and dialplan_uuid = '$dialplan_uuid' ";
$sql .= " order by dialplan_detail_group asc, dialplan_detail_order asc";
$sql = "select * from v_dialplan_details ";
$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@@ -567,7 +567,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$x++;
} //end foreach
unset($sql, $result, $row_count);
} //end if results
echo "<tr>\n";