diff --git a/htdocs/admin/remotestore/class/externalModules.class.php b/htdocs/admin/remotestore/class/externalModules.class.php index 4cbd59563f3..c2964d5c1a7 100644 --- a/htdocs/admin/remotestore/class/externalModules.class.php +++ b/htdocs/admin/remotestore/class/externalModules.class.php @@ -172,7 +172,7 @@ class ExternalModules $this->githubFileStatus = dol_is_file($this->cache_file) ? 1 : 0; } - // Check access to Dolistore API + // Check access to Dolistore API /api/categories -> /api/index.php/marketplace/categories if (getDolGlobalString('MAIN_ENABLE_EXTERNALMODULES_DOLISTORE')) { $this->dolistoreApiStatus = $this->checkApiStatus(); } @@ -212,7 +212,6 @@ class ExternalModules $url .= '?' . http_build_query($options); } - $url .= (preg_match('/\?/', $url) ? '&' : '?').'apikey='.$this->dolistore_api_key; $response = getURLContent($url, 'GET', '', 1, $httpheader, array('https'), 0, -1, 5, 5); $status_code = $response['http_code']; diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index bd893741efa..39ec893b724 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1256,7 +1256,7 @@ class Categorie extends CommonObject * - int (id of category) * - string (categories ids separated by comma) * - array (list of categories ids) - * @param int<0,1> $include [=0] Removed or 1=Keep only + * @param int<0,1> $include [=0] Removed or 1=Keep only the ID into $fromid * @param string $forcelangcode Lang code to force ('fr_FR', 'en_US', ...) or 'none' * @return int<-1,-1>|array Array of categories. this->cats and this->motherof are set, -1 on error */ @@ -1298,7 +1298,8 @@ class Categorie extends CommonObject } // Init $this->cats array - $sql = "SELECT DISTINCT c.rowid, c.label, c.ref_ext, c.description, c.color, c.position, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates + // Note: The DISTINCT reduces pb with old tables with duplicates but should not be used + $sql = "SELECT DISTINCT c.rowid, c.label, c.ref_ext, c.description, c.color, c.position, c.fk_parent, c.visible"; if (getDolGlobalInt('MAIN_MULTILANGS') && $current_lang !== 'none') { $sql .= ", t.label as label_trans, t.description as description_trans"; } @@ -1310,6 +1311,7 @@ class Categorie extends CommonObject $sql .= " AND c.type = ".(int) $type; dol_syslog(get_class($this)."::get_full_arbo get category list", LOG_DEBUG); + $resql = $this->db->query($sql); if ($resql) { $i = 0; @@ -1326,7 +1328,7 @@ class Categorie extends CommonObject $this->cats[$obj->rowid]['visible'] = $obj->visible; $this->cats[$obj->rowid]['ref_ext'] = $obj->ref_ext; $this->cats[$obj->rowid]['picto'] = 'category'; - // fields are filled with buildPathFromId + // fields are filled with buildPathFromId later $this->cats[$obj->rowid]['fullpath'] = ''; $this->cats[$obj->rowid]['fulllabel'] = ''; $i++;