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

Commit ac2f03e9 authored by theronakpatel's avatar theronakpatel
Browse files

separate patch files

parent 5befacb2

Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddle 
RUN patch -u ${BASE_DIR}/apps/dav/lib/AppInfo/Application.php -i  ${TMP_PATCH_DIR}/038-generic-event-fix.patch



#commenting code to re-enable account creation

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/039-reenable-ac-comment-setupfs.patch

RUN patch -u ${BASE_DIR}/lib/private/User/Session.php -i  ${TMP_PATCH_DIR}/039-reenable-ac-comment-setupfs.patch

RUN patch -u ${BASE_DIR}/lib/base.php -i  ${TMP_PATCH_DIR}/040-reenable-ac-comment-exception.patch



RUN rm -rf ${TMP_PATCH_DIR}

patches/039-reenable-ac-comment-setupfs.patch

+1 −19
Original line number Diff line number Diff line
@@ -31,21 +31,3 @@ Subject: [PATCH] Enabling account creation (by commenting) which does not check 
 

 			// trigger any other initialization

 			\OC::$server->get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($this->getUser()));
 
 No newline at end of file
 


--- ./lib/base.php	2024-09-04 16:25:48.446616914 +0000

+++ ./lib/base-new.php	2024-12-09 11:51:21.916843879 +0000

@@ -884,10 +884,10 @@

 				} catch (\Exception $e) {

 					// a GC exception should not prevent users from using OC,

 					// so log the exception

-					Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [

-						'app' => 'core',

-						'exception' => $e,

-					]);

+					//Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [

+					//	'app' => 'core',

+					//	'exception' => $e,

+					//]);

 				}

 			});

 		}
 
 No newline at end of file

patches/040-reenable-ac-comment-exception.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
From: Ronak Patel <ronak.patel.ext@murena.com>

Date: Mon, 09 Dec 2024 18:50:00 +0530

Subject: [PATCH] Enabling account creation: Comment exception for cache gc



--- ./lib/base.php	2024-09-04 16:25:48.446616914 +0000

+++ ./lib/base-new.php	2024-12-09 11:51:21.916843879 +0000

@@ -884,10 +884,10 @@

 				} catch (\Exception $e) {

 					// a GC exception should not prevent users from using OC,

 					// so log the exception

-					Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [

-						'app' => 'core',

-						'exception' => $e,

-					]);

+					//Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [

+					//	'app' => 'core',

+					//	'exception' => $e,

+					//]);

 				}

 			});

 		}
 
 No newline at end of file