[2024] Remove election-time specific code.

mysociety · Jul 5, 2024 · 0f62bbd · 0f62bbd
1 parent 83f92c2
commit 0f62bbd
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 160 deletions.
diff --git a/classes/Homepage.php b/classes/Homepage.php
@@ -34,16 +34,11 @@ public function display() {
         $common = new Common;
         $dissolution = Dissolution::dates();
 
-        // temp for 2024 election
-        $now = new \DateTime();
-        $election_date = new \DateTime('2024-07-04 22:00:00');
-
         $data['debates'] = $this->getDebatesData();
 
         $user = new User();
         $data['mp_data'] = $user->getRep($this->cons_type, $this->mp_house);
         $data["commons_dissolved"] = isset($dissolution[1]);
-        $data["after_election"] = $now > $election_date;
 
         $data['regional'] = $this->getRegionalList();
         $data['popular_searches'] = $common->getPopularSearches();

diff --git a/www/docs/postcode/index.php b/www/docs/postcode/index.php
@@ -10,11 +10,6 @@
 
 // handling to switch the GE message based either on time or a query string
 
-$now = new DateTime();
-$election_date = new DateTime('2024-07-04 22:00:00');
-
-$data['post_election_message'] = (($now > $election_date) || (get_http_var("post_election") == 1));
-
 $pc = get_http_var('pc');
 if (!$pc) {
     postcode_error('Please supply a postcode!');

diff --git a/www/includes/easyparliament/templates/html/index.php b/www/includes/easyparliament/templates/html/index.php
@@ -20,11 +20,7 @@
                 </div>
             </div>
             <?php } else { ?>
-            <?php if ($after_election === true) { ?>
-            <h1>Find out more about your new MP</h1>
-            <?php } else { ?>
-            <h1>Find out more about your <?php if ($commons_dissolved) { ?>former <?php } ?>MP, and election candidates</h1>
-            <?php } ?>
+            <h1>Find out more about your <?php if ($commons_dissolved) { ?>former <?php } ?>MP</h1>
             <div class="row collapse">
                 <form action="/postcode/" class="mp-search__form"  onsubmit="trackFormSubmit(this, 'PostcodeSearch', 'Submit', 'Home'); return false;">
                     <label for="postcode">Your postcode</label>

diff --git a/www/includes/easyparliament/templates/html/postcode/ge2024.php b/www/includes/easyparliament/templates/html/postcode/ge2024.php
diff --git a/www/includes/easyparliament/templates/html/postcode/index.php b/www/includes/easyparliament/templates/html/postcode/index.php
@@ -37,11 +37,7 @@ function member_image_box(string $person_id, string $person_url, string $person_
     }
 }
 
-if ($post_election_message) {
-    include "ge2024-post-election.php";
-} else {
-    include "ge2024.php";
-};
+include "ge2024-post-election.php";
 
 # The below is normally the main column, but for now let us make it the sidebar...