fix: Toujours charger le block, même sans saisie ou valeurs

blocks_fonctions.php

@@ -52,77 +52,74 @@ function balise_GENERER_BLOCK_dist($p) {
  * @return string
  */
 function _block_charger_block(int $id_block): string {
-	$html = '';
 	$where = ['id_block = ' . $id_block];
 	if (!test_espace_prive()) {
 		$where[] = 'statut = ' . sql_quote('publie');
 	}
 	$saisies = block_get_saisies($id_block);
 	$valeurs = blocks_deserialize(sql_getfetsel('valeurs', 'spip_blocks', $where));
-	if ($saisies && $valeurs) {
-		$contexte = array_merge(
-			[
-				'id_block' => $id_block,
-			],
-			block_get_valeurs($saisies, $valeurs)
-		);
 
-		$html = recuperer_fond('inclure/block', $contexte);
-
-		if ($blocs_enfants = sql_allfetsel(
-			'id_block, blocktype, valeurs',
-			'spip_blocks',
-			'objet="block" and id_objet = ' . $id_block
-		)) {
-			$html_enfants = '';
-			foreach ($blocs_enfants as $bloc_enfant) {
-				$contexte = array_merge(
-					[
-						'id_block' => $bloc_enfant['id_block'],
-					],
-					block_get_valeurs(
-						blocktype_info($bloc_enfant['blocktype'], 'saisies'),
-						blocks_deserialize($bloc_enfant['valeurs'])
-					)
-				);
-				if (test_espace_prive()) {
-					$squelette = 'prive/squelettes/inclure/block_objet';
-					$recuperer_fond_options = ['ajax' => 'block-' . $bloc_enfant['id_block']];
-				} else {
-					$squelette = 'inclure/block';
-					$recuperer_fond_options = [];
-				}
-				$html_enfants .= recuperer_fond(
-					$squelette,
-					$contexte,
-					$recuperer_fond_options
-				);
-			}
-			if (str_contains($html, '<!--blocks-->')) {
-				$html = str_replace('<!--blocks-->', $html_enfants, $html);
-			} else {
-				$html .= $html_enfants;
-			}
-		}
+	$contexte = array_merge(
+		[
+			'id_block' => $id_block,
+		],
+		block_get_valeurs($saisies, $valeurs ?? [])
+	);
+
+	$html = recuperer_fond('inclure/block', $contexte);
 
-		// Ajouter un block
-		if (test_espace_prive() && bloctype_trouver_enfants(block_get_blocktype($id_block))) {
-			$html .= recuperer_fond(
-				'prive/squelettes/inclure/block_objet',
+	if ($blocs_enfants = sql_allfetsel(
+		'id_block, blocktype, valeurs',
+		'spip_blocks',
+		'objet="block" and id_objet = ' . $id_block
+	)) {
+		$html_enfants = '';
+		foreach ($blocs_enfants as $bloc_enfant) {
+			$contexte = array_merge(
 				[
-					'objet'               => 'block',
-					'id_objet'            => $id_block,
-					//						'id_block'            => 'new',
-					'blocktype_parent' => block_get_blocktype($id_block),
-					'edit_bloc'           => 1,
+					'id_block' => $bloc_enfant['id_block'],
 				],
-				[
-					'ajax' => 'new_block-' . $id_block,
-				]
+				block_get_valeurs(
+					blocktype_info($bloc_enfant['blocktype'], 'saisies'),
+					blocks_deserialize($bloc_enfant['valeurs']) ?? []
+				)
+			);
+			if (test_espace_prive()) {
+				$squelette = 'prive/squelettes/inclure/block_objet';
+				$recuperer_fond_options = ['ajax' => 'block-' . $bloc_enfant['id_block']];
+			} else {
+				$squelette = 'inclure/block';
+				$recuperer_fond_options = [];
+			}
+			$html_enfants .= recuperer_fond(
+				$squelette,
+				$contexte,
+				$recuperer_fond_options
 			);
 		}
+		if (str_contains($html, '<!--blocks-->')) {
+			$html = str_replace('<!--blocks-->', $html_enfants, $html);
+		} else {
+			$html .= $html_enfants;
+		}
+	}
 
-	//}
+	// Ajouter un block
+	if (test_espace_prive() && bloctype_trouver_enfants(block_get_blocktype($id_block))) {
+		$html .= recuperer_fond(
+			'prive/squelettes/inclure/block_objet',
+			[
+				'objet'            => 'block',
+				'id_objet'         => $id_block,
+				//						'id_block'            => 'new',
+				'blocktype_parent' => block_get_blocktype($id_block),
+				'edit_bloc'        => 1,
+			],
+			[
+				'ajax' => 'new_block-' . $id_block,
+			]
+		);
+	}
 
 	return $html;
 }