Remove unused killme()

diff --git a/boot.php b/boot.php
index d54ee72a3d83c42336dc5a745fe4c4e24cf1314a..f36e770da189ccddde55ef7c70569f8222c71165 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -234,15 +234,6 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
        define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
 }
 
-/**
- * @brief Used to end the current process, after saving session state.
- * @deprecated
- */
-function killme()
-{
-       exit();
-}
-
 /**
  * @brief Returns the user id of locally logged in user or false.
  *

diff --git a/mod/photos.php b/mod/photos.php
index e763704c4062424a5f8f17244bbd9004d25d646a..2ca6c6a37bb132b482a786750f8b501433bdd91b 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -814,7 +814,7 @@ function photos_post(App $a)
 
        Hook::callAll('photo_post_end', $item_id);
 
-       // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
+       // addon uploaders should call "exit()" within the photo_post_end hook
        // if they do not wish to be redirected
 
        DI::baseUrl()->redirect($_SESSION['photo_return']);

diff --git a/src/Core/System.php b/src/Core/System.php
index 709864492e0c8268a04d41d051f8968b81808d84..63767ebb34a57dbbdc3ec03f37446ed220b00e4a 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -283,7 +283,6 @@ class System
 
        /// @todo Move the following functions from boot.php
        /*
-       function killme()
        function local_user()
        function public_contact()
        function remote_user()

diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 58e0adb99aea3f8e133188e590c6495d981b8ebe..f702d70bca366f93c02738355d57f884468427cb 100644 (file)
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -3305,7 +3305,7 @@ class ApiTest extends DatabaseTest
         */
        public function testApiOauthRequestToken()
        {
-               $this->markTestIncomplete('killme() kills phpunit as well');
+               $this->markTestIncomplete('exit() kills phpunit as well');
        }
 
        /**
@@ -3315,7 +3315,7 @@ class ApiTest extends DatabaseTest
         */
        public function testApiOauthAccessToken()
        {
-               $this->markTestIncomplete('killme() kills phpunit as well');
+               $this->markTestIncomplete('exit() kills phpunit as well');
        }
 
        /**