aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-16 02:44:23 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-16 02:44:23 +0000
commitd39eab08115aad2add54b9382c3744728508df35 (patch)
treedfb6c44dbf9bdf7db3f6097788eef91a84419289
parente02a497c2d49485ea4f4d8ac9fc7b43119436144 (diff)
downloadelgg-d39eab08115aad2add54b9382c3744728508df35.tar.gz
elgg-d39eab08115aad2add54b9382c3744728508df35.tar.bz2
Fixes #3141. Fixed twitter_api and oauth_api upgrades. Only worked on localhost because of code gnomes.
git-svn-id: http://code.elgg.org/elgg/trunk@8731 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php22
-rw-r--r--engine/lib/upgrades/2011031400-1.8_svn-oauth_api-8f33ee79c3e66222.php4
2 files changed, 8 insertions, 18 deletions
diff --git a/engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php b/engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php
index 0774cbea4..1d82c4995 100644
--- a/engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php
+++ b/engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php
@@ -12,24 +12,10 @@ elgg_generate_plugin_entities();
$db_prefix = elgg_get_config('dbprefix');
// find the old settings for twitterservice and copy them to the new one
-$options = array(
- 'type' => 'object',
- 'subtype' => 'plugin',
- 'joins' => array("JOIN {$db_prefix}objects_entity oe ON e.guid = oe.guid"),
- 'wheres' => array('title = "twitterservice"')
-);
-
-$objs = elgg_get_entities($options);
-
-if (!$objs) {
- return true;
-}
-
-$service = $objs[0];
-
+$service = elgg_get_plugin_from_id('twitterservice');
$api = elgg_get_plugin_from_id('twitter_api');
-if (!$api) {
+if (!$api || !$service) {
return true;
}
@@ -41,7 +27,7 @@ foreach ($settings as $setting) {
// update the user settings
$q = "UPDATE {$db_prefix}private_settings
- SET name = replace('twitterservice', 'twitter_api', name)
+ SET name = replace(name, 'twitterservice', 'twitter_api')
WHERE name like '%twitterservice%'";
update_data($q);
@@ -50,3 +36,5 @@ if ($service->isActive()) {
$api->activate();
$service->deactivate();
}
+
+$service->delete(); \ No newline at end of file
diff --git a/engine/lib/upgrades/2011031400-1.8_svn-oauth_api-8f33ee79c3e66222.php b/engine/lib/upgrades/2011031400-1.8_svn-oauth_api-8f33ee79c3e66222.php
index bfa3402b5..98c00f506 100644
--- a/engine/lib/upgrades/2011031400-1.8_svn-oauth_api-8f33ee79c3e66222.php
+++ b/engine/lib/upgrades/2011031400-1.8_svn-oauth_api-8f33ee79c3e66222.php
@@ -19,4 +19,6 @@ if (!$old || !$new) {
if ($old->isActive()) {
$old->deactivate();
$new->activate();
-} \ No newline at end of file
+}
+
+$old->delete(); \ No newline at end of file