Merge f68079cfc7 into 1b2ac50cfd

[ticket/17504] Fix tests failure caused by ondrej/php PPA repo label changed

.github/setup-exiftool.sh

@@ -10,5 +10,4 @@
 #
 set -e
 
-sudo apt-get update
 sudo apt-get install -y parallel libimage-exiftool-perl

.github/setup-sphinx.sh

@@ -11,7 +11,6 @@
 set -e
 set -x
 
-sudo apt-get update
 sudo apt-get install -q -y sphinxsearch
 
 DIR=$(dirname "$0")

.github/setup-unbuffer.sh

@@ -10,5 +10,4 @@
 #
 set -e
 
-sudo apt-get update
 sudo apt-get install -y expect-dev

.github/setup-webserver.sh

@@ -11,7 +11,6 @@
 set -e
 set -x
 
-sudo apt-get update
 sudo apt-get install -y nginx coreutils
 
 sudo service nginx stop

.github/workflows/tests.yml

@@ -28,6 +28,10 @@ jobs:
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
               uses: actions/checkout@v4
               with:
@@ -158,6 +162,10 @@ jobs:
                     - 6379:6379
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
               uses: actions/checkout@v4
 
@@ -299,6 +307,10 @@ jobs:
                     - 6379:6379
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
               uses: actions/checkout@v4
 
@@ -397,6 +409,10 @@ jobs:
 
 
         steps:
+            - name: Update Ubuntu package lists
+              run: |
+                  sudo apt-get update -y  --allow-releaseinfo-change
+
             - name: Checkout repository
               uses: actions/checkout@v4
 

phpBB/phpbb/textreparser/base.php

@@ -76,20 +76,16 @@ abstract class base implements reparser_interface
 		}
 
 		// Those BBCodes are disabled based on context and user permissions and that value is never
-		// stored in the database. Here we test whether they were used in the original text.
+		// stored in the database. However, when a user attempts to post a message that contains an
-		$bbcodes = array('flash', 'img', 'quote', 'url');
+		// unauthorized BBCode, the message is rejected. Therefore, messages found in the database
-		foreach ($bbcodes as $bbcode)
+		// should not contain any unauthorized BBCodes, which means it should be safe to enable all
-		{
+		// of them in bulk if they are not explicitly disabled in the record.
-			$field_name = 'enable_' . $bbcode . '_bbcode';
+		$record += [
-			$record[$field_name] = $this->guess_bbcode($record, $bbcode);
+			'enable_flash_bbcode' => true,
-		}
+			'enable_img_bbcode'   => true,
-
+			'enable_quote_bbcode' => true,
-		// Magic URLs are tied to the URL BBCode, that's why if magic URLs are enabled we make sure
+			'enable_url_bbcode'   => true,
-		// that the URL BBCode is also enabled
+		];
-		if ($record['enable_magic_url'])
-		{
-			$record['enable_url_bbcode'] = true;
-		}
 
 		return $record;
 	}