Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04bb041b authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

fix(offset): applied offset corrections to more additional patches(2)

parent 90d0d80f
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ This patch removes the top right icon enabling the global user search function a
diff --git layout.user.php layout.user.php-new
--- ./core/templates/layout.user.php	2023-03-28 14:54:05.873566570 +0530
+++ ./core/templates/layout.user-new.php	2023-03-28 14:54:35.044218831 +0530
@@ -70,7 +70,6 @@
@@ -76,7 +76,6 @@
 			<div class="header-right">
 				<div id="unified-search"></div>
 				<div id="notifications"></div>
+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ this filtering works in conjunction with the autocomplete feature disabled in ne
diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Collaboration/Collaborators/UserPlugin-new.php
--- lib/private/Collaboration/Collaborators/UserPlugin.php	2025-02-13 19:30:40
+++ lib/private/Collaboration/Collaborators/UserPlugin-new.php	2025-03-07 12:48:50
@@ -175,8 +175,8 @@
@@ -150,8 +150,8 @@
 			if (
 				$this->shareeEnumerationFullMatch &&
 				$lowerSearch !== '' && (strtolower($uid) === $lowerSearch ||
@@ -29,7 +29,7 @@ diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Co
diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php
--- lib/private/Collaboration/Collaborators/MailPlugin.php	2025-02-13 19:30:40
+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php	2025-03-07 12:55:25
@@ -39,6 +39,7 @@
@@ -19,6 +19,7 @@
 use OCP\IUserSession;
 use OCP\Mail\IMailer;
 use OCP\Share\IShare;
@@ -37,7 +37,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 
 class MailPlugin implements ISearchPlugin {
 	protected bool $shareWithGroupOnly;
@@ -61,8 +62,10 @@
@@ -42,8 +43,10 @@
 		private KnownUserService $knownUserService,
 		private IUserSession $userSession,
 		private IMailer $mailer,
@@ -48,7 +48,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
 		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
 		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
@@ -221,27 +224,61 @@
@@ -204,27 +207,61 @@
 						if ($exactEmailMatch) {
 							$searchResult->markExactIdMatch($emailType);
 						}
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ $_SERVER in IRequest is immutable but we want to switch the header to deliver tr

--- lib/private/L10N/Factory.php	2023-11-29 17:46:48.253716340 +0530
+++ lib/private/L10N/Factory-new.php	2023-11-29 17:47:26.194920628 +0530
@@ -479,6 +479,9 @@
@@ -428,6 +428,9 @@
 	 */
 	private function getLanguageFromRequest(?string $app = null): string {
 		$header = $this->request->getHeader('ACCEPT_LANGUAGE');