Update Error: pubcrawl/Mod_Inbox.php Changed?

Mon, 28 Aug 2023 09:14:12 +0200

adminsforum@hubzilla.org

Scott M. Stolz wrote the following post Mon, 28 Aug 2023 09:14:12 +0200

Update Error: pubcrawl/Mod_Inbox.php Changed?

I am getting this error when trying to update. It says the Mod_Inbox.php file changed, however I never changed it.

error: Your local changes to the following files would be overwritten by merge:
        pubcrawl/Mod_Inbox.php
Please commit your changes or stash them before you merge.
Aborting

How do I resolve this?

Mon, 28 Aug 2023 09:21:40 +0200

Scott M. Stolz

scott@loves.tech

More information:

The symbolic link of /addon/pubcrawl/Mod_Inbox.php which points to /extend/addon/hzaddons/pubcrawl/Mod_Inbox.php shows a date of Nov 22, 2022, so according to file manager, this file has not been changed recently.

And I certainly did not change it.

Mon, 28 Aug 2023 20:22:34 +0200

Mario Vavti

mario@hub.somaton.com

cd into /extend/addon/hzaddons and run git diff to see what changed. It might be just file permissions...

Eventually you can run git reset --hard HEAD to reset your repository...

Fri, 01 Sep 2023 07:15:48 +0200

Scott M. Stolz

scott@loves.tech

I ran git diff, and this is what it said:

diff --git a/pubcrawl/Mod_Inbox.php b/pubcrawl/Mod_Inbox.php
index 3b34b8a1..4364db8a 100644
--- a/pubcrawl/Mod_Inbox.php
+++ b/pubcrawl/Mod_Inbox.php
@@ -35,38 +35,29 @@ class Inbox extends Controller {
                        //http_status_exit(404, 'Not found');
                //}

-               $data = file_get_contents('php://input');
-
-               if (!$data) {
-                       return;
-               }
-
-               logger('inbox_args: ' . print_r(App::$argv, true));
-
                $sys_disabled = false;

                if (Config::Get('system', 'disable_discover_tab') || Config::Get('system', 'disable_activitypub_discover_tab')) {
                        $sys_disabled = true;
                }

-               $shared_inbox = false;
:

Which is strange, because I never changed that file.

I ran the git reset command, as specified, and then ran util/udall and it seems to clear everything up.

Thank you.