From 0a6f7c1914cf78655d4700a84269faadf7ef69e3 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 17 Mar 2011 01:16:48 +0000
Subject: Fixes #3141. Disabling twitter_api and oauth_api upon upgrade because
 we can't check previous states. Adding an admin notice. twitter_api conflicts
 with twitterservice and oauth_api conflicts with oauth_lib.

git-svn-id: http://code.elgg.org/elgg/trunk@8742 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/oauth_api/manifest.xml   | 5 +++++
 mod/twitter_api/manifest.xml | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'mod')

diff --git a/mod/oauth_api/manifest.xml b/mod/oauth_api/manifest.xml
index 1d743fdab..121c2e774 100644
--- a/mod/oauth_api/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -12,4 +12,9 @@
 		<type>elgg_version</type>
 		<version>2010040201</version>
 	</requires>
+
+	<conflicts>
+		<type>plugin</type>
+		<name>oauth_lib</name>
+	</conflicts>
 </plugin_manifest>
diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index 28af93328..51306c98e 100644
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -21,4 +21,9 @@
 		<type>php_extension</type>
 		<name>curl</name>
 	</requires>
+
+	<conflicts>
+		<type>plugin</type>
+		<name>twitterservice</name>
+	</conflicts>
 </plugin_manifest>
-- 
cgit v1.2.3