From f102aace97e665bf88766006df02e9b976bb6f9f Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 22 Oct 2012 08:05:07 -0400
Subject: [PATCH] Updated Amazon library to latest tagged release (2.0.2).
---
.../ZendService/library/ZendService/Amazon/Ec2/AbstractEc2.php | 2 +-
.../library/ZendService/Amazon/SimpleDb/SimpleDb.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vendor/ZendService/library/ZendService/Amazon/Ec2/AbstractEc2.php b/vendor/ZendService/library/ZendService/Amazon/Ec2/AbstractEc2.php
index 7da5e0dc961..7cd9831068e 100644
--- a/vendor/ZendService/library/ZendService/Amazon/Ec2/AbstractEc2.php
+++ b/vendor/ZendService/library/ZendService/Amazon/Ec2/AbstractEc2.php
@@ -101,7 +101,7 @@ abstract class AbstractEc2 extends Amazon\AbstractAmazon
public static function setRegion($region)
{
if(in_array(strtolower($region), self::$_validEc2Regions, true)) {
- self::$_defaultRegion = $region;
+ self::$_region = $region;
} else {
throw new Exception\InvalidArgumentException('Invalid Amazon Ec2 Region');
}
diff --git a/vendor/ZendService/library/ZendService/Amazon/SimpleDb/SimpleDb.php b/vendor/ZendService/library/ZendService/Amazon/SimpleDb/SimpleDb.php
index e1e246c6bf5..8be8d40574d 100644
--- a/vendor/ZendService/library/ZendService/Amazon/SimpleDb/SimpleDb.php
+++ b/vendor/ZendService/library/ZendService/Amazon/SimpleDb/SimpleDb.php
@@ -366,7 +366,7 @@ class SimpleDb extends \ZendService\Amazon\AbstractAmazon
}
}
- $nextToken = (string)$xml->NextToken;
+ $nextToken = (string)$xml->SelectResult->NextToken;
return new Page($attributes, $nextToken);
}
--
GitLab