Merge pull request #36 from luffy-xiao/patch-1

Update readFromFolder function in api

Author: thybag

SharePointAPI.php

@@ -452,15 +452,16 @@ public function read ($list_name, $limit = NULL, $query = NULL, $view = NULL, $s
 	 *
 	 * @param String $listName 
 	 * @param String $folderName
+	 * @param bool   $isLibrary
 	 * @param String $limit
 	 * @param String $query
 	 * @param String $view 
 	 * @param String $sort
 	 *
 	 * @return Array
 	 */
-	public function readFromFolder($listName, $folderName = '', $limit = NULL, $query = NULL, $view = NULL, $sort = NULL) {
-		return $this->read($list_name, $limit, $query, $view, $sort, "<Folder>" . $listName . '\\' . $folderName . "</Folder>" );
+	public function readFromFolder($listName, $folderName = '', $isLibrary = false, $limit = NULL, $query = NULL, $view = NULL, $sort = NULL) {
+		return $this->read($listName, $limit, $query, $view, $sort, "<Folder>" . ($isLibrary ? '' : 'Lists/') . $listName . '/' . $folderName . "</Folder>" );
 	}
 
 	/**