Parcourir la source

remove the old keys, if they are still stored

El RIDO il y a 2 ans
Parent
commit
b2db26998d
2 fichiers modifiés avec 8 ajouts et 2 suppressions
  1. 6 0
      lib/Model/Paste.php
  2. 2 2
      tst/ControllerTest.php

+ 6 - 0
lib/Model/Paste.php

@@ -47,6 +47,12 @@ class Paste extends AbstractModel
             $data['meta']['time_to_live'] = $data['meta']['expire_date'] - time();
             unset($data['meta']['expire_date']);
         }
+        if (array_key_exists('created', $data['meta'])) {
+            unset($data['meta']['created']);
+        }
+        if (array_key_exists('postdate', $data['meta'])) {
+            unset($data['meta']['postdate']);
+        }
 
         // check if non-expired burn after reading paste needs to be deleted
         if (

+ 2 - 2
tst/ControllerTest.php

@@ -742,7 +742,7 @@ class ControllerTest extends TestCase
         $this->assertEquals($paste['adata'][1], $response['adata'][1], 'outputs formatter correctly');
         $this->assertEquals($paste['adata'][2], $response['adata'][2], 'outputs opendiscussion correctly');
         $this->assertEquals($paste['adata'][3], $response['adata'][3], 'outputs burnafterreading correctly');
-        $this->assertFalse(array_key_exists('created', $paste['meta']), 'does not output created');
+        $this->assertFalse(array_key_exists('created', $response['meta']), 'does not output created');
         $this->assertEquals(0, $response['comment_count'], 'outputs comment_count correctly');
         $this->assertEquals(0, $response['comment_offset'], 'outputs comment_offset correctly');
     }
@@ -772,7 +772,7 @@ class ControllerTest extends TestCase
         $this->assertStringEndsWith('?' . $response['id'], $response['url'], 'returned URL points to new paste');
         $this->assertEquals($paste['data'], $response['data'], 'outputs data correctly');
         $this->assertEquals('syntaxhighlighting', $response['meta']['formatter'], 'outputs format correctly');
-        $this->assertEquals($paste['meta']['postdate'], $response['meta']['postdate'], 'outputs postdate correctly');
+        $this->assertFalse(array_key_exists('postdate', $response['meta']), 'does not output postdate');
         $this->assertEquals($paste['meta']['opendiscussion'], $response['meta']['opendiscussion'], 'outputs opendiscussion correctly');
         $this->assertEquals(0, $response['comment_count'], 'outputs comment_count correctly');
         $this->assertEquals(0, $response['comment_offset'], 'outputs comment_offset correctly');