From owner-svn-ports-all@freebsd.org Mon Jan 4 17:33:55 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B76F14DDB25; Mon, 4 Jan 2021 17:33:55 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8jR74nPyz3LvW; Mon, 4 Jan 2021 17:33:55 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9781E1DF87; Mon, 4 Jan 2021 17:33:55 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 104HXtOd016674; Mon, 4 Jan 2021 17:33:55 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 104HXs5X016671; Mon, 4 Jan 2021 17:33:54 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <202101041733.104HXs5X016671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Mon, 4 Jan 2021 17:33:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560315 - in head/devel/phabricator: . files X-SVN-Group: ports-head X-SVN-Commit-Author: grembo X-SVN-Commit-Paths: in head/devel/phabricator: . files X-SVN-Commit-Revision: 560315 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 17:33:55 -0000 Author: grembo Date: Mon Jan 4 17:33:54 2021 New Revision: 560315 URL: https://svnweb.freebsd.org/changeset/ports/560315 Log: Add patch to fix embeded pholio mock image selection. See: https://discourse.phabricator-community.org/t/patch-pholiomockembedview-image-specification-broken/4482 Added: head/devel/phabricator/files/patch-src_applications_pholio_remarkup_PholioRemarkupRule.php (contents, props changed) head/devel/phabricator/files/patch-src_applications_pholio_view_PholioMockEmbedView.php (contents, props changed) head/devel/phabricator/files/patch-src_docs_user_userguide_remarkup.diviner (contents, props changed) Modified: head/devel/phabricator/Makefile Modified: head/devel/phabricator/Makefile ============================================================================== --- head/devel/phabricator/Makefile Mon Jan 4 16:37:18 2021 (r560314) +++ head/devel/phabricator/Makefile Mon Jan 4 17:33:54 2021 (r560315) @@ -2,6 +2,7 @@ PORTNAME= phabricator PORTVERSION= 20201119 +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} Added: head/devel/phabricator/files/patch-src_applications_pholio_remarkup_PholioRemarkupRule.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/phabricator/files/patch-src_applications_pholio_remarkup_PholioRemarkupRule.php Mon Jan 4 17:33:54 2021 (r560315) @@ -0,0 +1,11 @@ +--- src/applications/pholio/remarkup/PholioRemarkupRule.php.orig 2020-11-19 21:48:33 UTC ++++ src/applications/pholio/remarkup/PholioRemarkupRule.php +@@ -75,6 +75,8 @@ final class PholioRemarkupRule extends PhabricatorObje + $opts = $parser->parse(substr($options, 1)); + + if (isset($opts['image'])) { ++ // PholioMockEmbedView shows only the first image passed. ++ // Keep "&" syntax for backwards compatibility. + $images = array_unique( + explode('&', preg_replace('/\s+/', '', $opts['image']))); + Added: head/devel/phabricator/files/patch-src_applications_pholio_view_PholioMockEmbedView.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/phabricator/files/patch-src_applications_pholio_view_PholioMockEmbedView.php Mon Jan 4 17:33:54 2021 (r560315) @@ -0,0 +1,12 @@ +--- src/applications/pholio/view/PholioMockEmbedView.php.orig 2020-11-19 21:48:33 UTC ++++ src/applications/pholio/view/PholioMockEmbedView.php +@@ -25,7 +25,8 @@ final class PholioMockEmbedView extends AphrontView { + $thumbnail = null; + if (!empty($this->images)) { + $images_to_show = array_intersect_key( +- $this->mock->getActiveImages(), array_flip($this->images)); ++ mpull($mock->getActiveImages(), null, 'getID'), ++ array_flip($this->images)); + } + + $xform = PhabricatorFileTransform::getTransformByKey( Added: head/devel/phabricator/files/patch-src_docs_user_userguide_remarkup.diviner ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/phabricator/files/patch-src_docs_user_userguide_remarkup.diviner Mon Jan 4 17:33:54 2021 (r560315) @@ -0,0 +1,20 @@ +--- src/docs/user/userguide/remarkup.diviner.orig 2020-11-19 21:48:33 UTC ++++ src/docs/user/userguide/remarkup.diviner +@@ -393,14 +393,13 @@ You can embed a Pholio mock by using braces to refer t + + {M123} + +-By default the first four images from the mock set are displayed. This behavior ++By default the first image from the mock is are displayed. This behavior + can be overridden with the **image** option. With the **image** option you can +-provide one or more image IDs to display. ++provide an image ID to display. + +-You can set the image (or images) to display like this: ++You can set the image to display like this: + + {M123, image=12345} +- {M123, image=12345 & 6789} + + == Embedding Pastes +