Bug fixes for merge down operations for specific cloud providers. Min…

…or adjustments.
cubiclesoft · Jul 29, 2016 · 53a41c0 · 53a41c0
1 parent a65652f
commit 53a41c0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Features
 * Block-based storage for major reductions in the number of API calls made.
 * And much, much more.  See the official documentation for a more complete feature list.
 * Also has a liberal open source license.  MIT or LGPL, your choice.
-* Designed for relatively painless integration into your envrionment.
+* Designed for relatively painless integration into your environment.
 * Sits on GitHub for all of that pull request and issue tracker goodness to easily submit changes and ideas respectively.
 
 More Information

diff --git a/backup.php b/backup.php
@@ -45,6 +45,7 @@
 		echo "\n";
 		echo "Examples:\n";
 		echo "\tphp " . $args["file"] . " -f\n";
+		echo "\tphp " . $args["file"] . " -p\n";
 
 		exit();
 	}

diff --git a/support/cb_amazon_cloud_drive.php b/support/cb_amazon_cloud_drive.php
@@ -420,7 +420,7 @@ public function FinishMergeDown()
 		{
 			// Queue up merge operations.
 			$this->summary["mergeops"][] = array("msg" => "Deleting incremental '" . $this->incrementals[1] . "' (1)", "type" => "delete", "info" => $this->incrementals[1]);
-			$this->summary["mergeops"][] = array("msg" => "Saving updated block list.", "type" => "saveblocklist", "info" => array($incrementals[0], $this->remotemergeblocklist));
+			$this->summary["mergeops"][] = array("msg" => "Saving updated block list.", "type" => "saveblocklist", "info" => array($this->incrementals[0], $this->remotemergeblocklist));
 
 			$incrementals = array();
 			$incrementals[0] = $this->incrementals[0];

diff --git a/support/sdk_amazon_cloud_drive.php b/support/sdk_amazon_cloud_drive.php
@@ -133,7 +133,7 @@ public function InteractiveLogin()
 				}
 				else if ($result2["response"]["code"] != 200)
 				{
-					return array("success" => false, "error" => self::ACD_Translate("Expected a 200 response from Amazon.  Received '%s'.", $result["response"]["line"]), "errorcode" => "unexpected_amazon_response", "info" => $result2);
+					return array("success" => false, "error" => self::ACD_Translate("Expected a 200 response from Amazon.  Received '%s'.", $result2["response"]["line"]), "errorcode" => "unexpected_amazon_response", "info" => $result2);
 				}
 				else
 				{