minor edits for zotero#153

abaevbog · Jun 23, 2023 · e1a47e3 · e1a47e3
1 parent ecbbbc2
commit e1a47e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/controllers/ApiController.php b/controllers/ApiController.php
@@ -482,7 +482,7 @@ public function init($extra) {
 
 		// Sorting by Item Type or Added By currently require writing to shard tables, so don't
 		// send those to the read replicas
-		if ($this->queryParams['sort'] == 'itemType' || $this->queryParams['sort'] == 'addedBy' || $this->queryParams['sort'] == 'editedBy') {
+		if (in_array($this->queryParams['sort'], ['itemType', 'addedBy', 'editedBy'])) {
 			Zotero_DB::readOnly(false);
 		}
 

diff --git a/model/Items.inc.php b/model/Items.inc.php
@@ -275,10 +275,10 @@ public static function search($libraryID, $onlyTopLevel = false, array $params =
 					$sql .= "JOIN tmpItemTypeNames TITN ON (TITN.itemTypeID=$itemTypeIDSelector) ";
 					break;
 
-				case 'editedBy':
 				case 'addedBy':
+				case 'editedBy':
 					$isGroup = Zotero_Libraries::getType($libraryID) == 'group';
-					$userParameter = $params['sort'] == "editedBy" ? 'lastModifiedByUserID' : 'createdByUserID';
+					$userParameter = $params['sort'] == "addedBy" ? 'createdByUserID' : 'lastModifiedByUserID';
 					if ($isGroup) {
 						$sql2 = "SELECT DISTINCT $userParameter FROM items
 								JOIN groupItems USING (itemID) WHERE
@@ -551,9 +551,9 @@ public static function search($libraryID, $onlyTopLevel = false, array $params =
 				case 'date':
 					$orderSQL = "$sortTable.value";
 					break;
-
-				case 'editedBy':	
+
 				case 'addedBy':
+				case 'editedBy':
 					if ($isGroup && $createdByUserIDs) {
 						$orderSQL = "TCBU.username";
 					}