Date: Sun, 18 Dec 2022 09:56:08 GMT From: Ronald Klop <ronald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 624cb5d4e912 - main - net/phpldapadmin: forgot to remove one file Message-ID: <202212180956.2BI9u8EO031786@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=624cb5d4e912fd46da6219063e2fdb0fb8a76241 commit 624cb5d4e912fd46da6219063e2fdb0fb8a76241 Author: Ronald Klop <ronald@FreeBSD.org> AuthorDate: 2022-12-18 09:34:57 +0000 Commit: Ronald Klop <ronald@FreeBSD.org> CommitDate: 2022-12-18 09:55:48 +0000 net/phpldapadmin: forgot to remove one file This file was in the review but not in the commit. Fixes patch so no need to inc portrevision: ===> Patching for phpldapadmin-php81-1.2.6.4 ===> Applying FreeBSD patches for phpldapadmin-php81-1.2.6.4 from /usr/ports/net/phpldapadmin/files Ignoring previously applied (or reversed) patch. 1 out of 1 hunks ignored--saving rejects to htdocs/collapse.php.rej ===> FAILED Applying FreeBSD patch-htdocs_collapse.php ===> FAILED to apply cleanly FreeBSD patch(es) patch-htdocs_collapse.php *** Error code 1 PR: 268349 Approved by: rene (mentor) Differential Revision: https://reviews.freebsd.org/D37700 --- net/phpldapadmin/files/patch-htdocs_collapse.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/net/phpldapadmin/files/patch-htdocs_collapse.php b/net/phpldapadmin/files/patch-htdocs_collapse.php deleted file mode 100644 index 19d45a350dae..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_collapse.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/collapse.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/collapse.php -@@ -19,7 +19,7 @@ $dn = get_request('dn','GET',true); - $tree = get_cached_item($app['server']->getIndex(),'tree'); - $entry = $tree->getEntry($dn); - $entry->close(); --set_cached_item($app['server']->getIndex(),'tree','null',$tree); -+set_cached_item($app['server']->getIndex(),$tree,'tree','null'); - - header(sprintf('Location:index.php?server_id=%s&junk=%s#%s%s', - $app['server']->getIndex(),random_junk(),htmlid($app['server']->getIndex(),$dn),app_session_param()));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212180956.2BI9u8EO031786>