From 3d0a72e916281dd57da2eb52abb193c99cba4dff Mon Sep 17 00:00:00 2001
From: "real3t@gmail.com" <>
Date: Mon, 20 Apr 2015 16:51:20 +0000
Subject: [PATCH] =?UTF-8?q?Oups,=20la=20mise=20=C3=A0=20jour=20d'un=20site?=
 =?UTF-8?q?=20syndiqu=C3=A9=20ne=20marchait=20pas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/soyezcreateurs.php         | 56 +++++++++++++++++----------------
 base/soyezcreateurs_install.php |  6 ++--
 plugin.xml                      |  2 +-
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/base/soyezcreateurs.php b/base/soyezcreateurs.php
index f6f83e59..c5648a85 100644
--- a/base/soyezcreateurs.php
+++ b/base/soyezcreateurs.php
@@ -580,33 +580,35 @@ function id_site($titre, $id_rubrique) {
 
 function create_site($site, $rubrique) {
 	$id_rubrique = id_rubrique($rubrique);
-	$id_site = id_site($site['nom_site'], $id_rubrique);
-	if ($id_site > 0) {
-		sql_updateq(
-			"spip_syndic", array(
-				"url_site" => $site['url_site'],
-				"url_syndic" => $site['url_syndic'],
-				"descriptif" => $site['descriptif'],
-				"statut" => $site['statut'] ? $site['statut']:'prop',
-				"syndication" => $site['url_syndic'] ? 'oui':'non'
-			), "id_syndic='$id_syndic'"
-		);
-	} else {
-		$id_site = sql_insertq(
-			"spip_syndic", array(
-				"id_rubrique" => $id_rubrique,
-				"nom_site" => $site['nom_site'],
-				"url_site" => $site['url_site'],
-				"url_syndic" => $site['url_syndic'],
-				"descriptif" => $site['descriptif'],
-				"statut" => $site['statut'] ? $site['statut']:'prop',
-				"syndication" => $site['url_syndic'] ? 'oui':'non'
-			)
-		);
-		include_spip('inc/rubriques');
-		calculer_rubriques();
-		propager_les_secteurs();
-		effacer_meta("date_calcul_rubriques");
+	if ($id_rubrique > 0) {
+		$id_site = id_site($site['nom_site'], $id_rubrique);
+		if ($id_site > 0) {
+			sql_updateq(
+				"spip_syndic", array(
+					"url_site" => $site['url_site'],
+					"url_syndic" => $site['url_syndic'],
+					"descriptif" => $site['descriptif'],
+					"statut" => $site['statut'] ? $site['statut']:'prop',
+					"syndication" => $site['url_syndic'] ? 'oui':'non'
+				), "id_syndic=$id_site"
+			);
+		} else {
+			$id_site = sql_insertq(
+				"spip_syndic", array(
+					"id_rubrique" => $id_rubrique,
+					"nom_site" => $site['nom_site'],
+					"url_site" => $site['url_site'],
+					"url_syndic" => $site['url_syndic'],
+					"descriptif" => $site['descriptif'],
+					"statut" => $site['statut'] ? $site['statut']:'prop',
+					"syndication" => $site['url_syndic'] ? 'oui':'non'
+				)
+			);
+			include_spip('inc/rubriques');
+			calculer_rubriques();
+			propager_les_secteurs();
+			effacer_meta("date_calcul_rubriques");
+		}
 	}
 	return $id_site;
 }
diff --git a/base/soyezcreateurs_install.php b/base/soyezcreateurs_install.php
index 7c1616f5..ee5b14dc 100644
--- a/base/soyezcreateurs_install.php
+++ b/base/soyezcreateurs_install.php
@@ -179,8 +179,10 @@ function soyezcreateurs_upgrade($nom_meta_base_version,$version_cible){
 			$sites['url_syndic'] = "";
 			$sites['statut'] = 'publie';
 			$id_site = create_site($sites, "80. Réseaux sociaux");
-				create_logo('documents/siteon5.png', $type='site', $id_site, 'png');
-				create_site_mot($id_site, "ReseauxSociaux", "_Specialisation_Sites");
+				if ($id_site > 0) {
+					create_logo('documents/siteon5.png', $type='site', $id_site, 'png');
+					create_site_mot($id_site, "ReseauxSociaux", "_Specialisation_Sites");
+				}
 			ecrire_meta($nom_meta_base_version,$current_version='3.0.34','non');
 		}
 		
diff --git a/plugin.xml b/plugin.xml
index cdfc5544..e00ecd42 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,7 +5,7 @@
 	<licence>&#169; 2003-2013 - GPL</licence>
 	<lien>http://contrib.spip.net/SoyezCreateurs,1237?tri_articles=titre</lien>
 	
-	<version>3.5.15</version>
+	<version>3.5.16</version>
 	<version_base>3.0.34</version_base>
 	
 	<etat>stable</etat>
-- 
GitLab