Merge branch 'main' into brokenexisting

2020-08-10 14:17:59 +01:00
parent c7dcf62353 f4cf8e2e16
commit b532361440
2 changed files with 2 additions and 7 deletions
--- a/app/public/existing.php
+++ b/app/public/existing.php
@@ -3,14 +3,9 @@
    require_once __DIR__ . "/../includes/header.php";

    if (is_signed_in()) {
-      $closed_requests =  get_my_open_requests($db);
+      $closed_requests =  get_my_closed_requests($db);
      $subscriptions = get_subscribed_requests($db);
-<<<<<<< Updated upstream
-
-      $requests = get_my_requests($db);
-=======
      $open_requests = get_my_open_requests($db);
->>>>>>> Stashed changes

      foreach($requests as $req) {
        if ($req['status'] != "Closed") {