Merge pull request #110 from mjrider/bugfixes-95

Fixes from production enviroments
Ariadne-CMS · May 11, 2016 · 60ba61e · 60ba61e
2 parents 29e0f1a + 2bfaea4
commit 60ba61e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/lib/includes/loader.web.php b/lib/includes/loader.web.php
@@ -1212,3 +1212,9 @@ function ldProcessRequest($AR_PATH_INFO=null) {
 			echo $image;
 		}
 	}
+
+	function ldGetPutHandle() {
+		$stdin = fopen("php://input", "r");
+		return new ar_content_filesFile($stdin);
+	}
+
diff --git a/lib/templates/pobject/explore.browse.php b/lib/templates/pobject/explore.browse.php
@@ -112,13 +112,15 @@
 
 		$object_list = ar::get($eventData['path'])
 		->find($query)
-		->limit($eventData['limit'], $eventData['offset'])
+		->limit($eventData['limit'])
+		->offset($eventData['offset'])
 		->order($eventData['order'])
 		->call($eventData['template'], $eventData['args']);
 
 		$object_count = ar::get($eventData['path'])
 		->find($query)
-		->limit($eventData['limit'], $eventData['offset'])
+		->limit($eventData['limit'])
+		->offset($eventData['offset'])
 		->order($eventData['order'])
 		->count();
 
@@ -127,16 +129,16 @@
 
 		$colDefs = $eventData['args']['columns'];
 		foreach($colDefs as $colKey => $colDef ) {
-		        if ( $colDef['hide'] ) {
-		                unset($colDefs[$colKey]);
-                        } else {
-        			$colDefs[$colKey] = array_merge($colDef, [ 'key' => $colKey ]);
-                        }
+			if ( $colDef['hide'] ) {
+				unset($colDefs[$colKey]);
+			} else {
+				$colDefs[$colKey] = array_merge($colDef, [ 'key' => $colKey ]);
+			}
 		}
-		$colDefs = array_values($colDefs);
+		$colDefs        = array_values($colDefs);
 		$viewtype       = $eventData['view'];
 		$items_per_page = $eventData['limit'];
-		$current_page   = floor($eventData['offset'] / $eventData['limit']);
+		$current_page   = 1 + floor($eventData['offset'] / $eventData['limit']);
 
 		if( $viewtype == "details" ) {
 			$datalist = array();