From 651d6dc8c469e687f97237f926810d7420f72662 Mon Sep 17 00:00:00 2001
From: Felipe Figueroa <amenadiel@gmail.com>
Date: Tue, 5 Jun 2018 10:23:19 -0400
Subject: _getFKProps returns a value instead of null

---
 src/controllers/AggregatesController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/controllers/AggregatesController.php')

diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php
index e09ac63c..906ce1a5 100644
--- a/src/controllers/AggregatesController.php
+++ b/src/controllers/AggregatesController.php
@@ -77,7 +77,7 @@ class AggregatesController extends BaseController
 
         $output = ob_get_clean();
 
-        $this->printHeader($this->headerTitle(), null, true, $header_template);
+        $this->printHeader($this->headerTitle());
         $this->printBody();
         echo $output;
 
@@ -100,7 +100,7 @@ class AggregatesController extends BaseController
             'aggrname'    => [
                 'title' => $this->lang['strname'],
                 'field' => Decorator::field('proname'),
-                'url'   => "redirect.php?subject=aggregate&amp;action=properties&amp;{$misc->href}&amp;",
+                'url'   => "redirect.php?subject=aggregate&amp;action=properties&amp;{$this->misc->href}&amp;",
                 'vars'  => ['aggrname' => 'proname', 'aggrtype' => 'proargtypes'],
             ],
             'aggrtype'    => [
@@ -156,7 +156,7 @@ class AggregatesController extends BaseController
             unset($actions['alter']);
         }
 
-        $echo->printTable($aggregates, $columns, $actions, $this->table_place, $this->lang['strnoaggregates']);
+        echo $this->printTable($aggregates, $columns, $actions, $this->table_place, $this->lang['strnoaggregates']);
 
         $navlinks = [
             'create' => [
@@ -271,7 +271,7 @@ class AggregatesController extends BaseController
         $this->printTitle($this->lang['strcreateaggregate'], 'pg.aggregate.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.\SUBFOLDER."/src/views/aggregates\" method=\"post\">\n";
+        echo '<form action="' . \SUBFOLDER . "/src/views/aggregates\" method=\"post\">\n";
         echo "<table>\n";
         echo "\t<tr>\n\t\t<th class=\"data left required\">{$this->lang['strname']}</th>\n";
         echo "\t\t<td class=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$this->data->_maxNameLen}\" value=\"",
@@ -353,7 +353,7 @@ class AggregatesController extends BaseController
         $this->printTitle($this->lang['stralter'], 'pg.aggregate.alter');
         $this->printMsg($msg);
 
-        echo '<form action="'.\SUBFOLDER."/src/views/aggregates\" method=\"post\">\n";
+        echo '<form action="' . \SUBFOLDER . "/src/views/aggregates\" method=\"post\">\n";
         $aggrdata = $this->data->getAggregate($_REQUEST['aggrname'], $_REQUEST['aggrtype']);
         if ($aggrdata->recordCount() > 0) {
             // Output table header
@@ -401,7 +401,7 @@ class AggregatesController extends BaseController
 
             echo '<p>', sprintf($this->lang['strconfdropaggregate'], htmlspecialchars($_REQUEST['aggrname'])), "</p>\n";
 
-            echo '<form action="'.\SUBFOLDER."/src/views/aggregates\" method=\"post\">\n";
+            echo '<form action="' . \SUBFOLDER . "/src/views/aggregates\" method=\"post\">\n";
             echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$this->lang['strcascade']}</label></p>\n";
             echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="aggrname" value="', htmlspecialchars($_REQUEST['aggrname']), "\" />\n";
-- 
cgit v1.2.3