Mercurial > hg > rc2
comparison program/lib/Roundcube/rcube_addressbook.php @ 25:bea5a38be938
More cleaning up php8 Warnings/deprecations
| author | Charlie Root |
|---|---|
| date | Sat, 18 Oct 2025 12:24:31 -0400 |
| parents | 4681f974d28b |
| children | c32b53434b47 |
comparison
equal
deleted
inserted
replaced
| 24:e53add5ddac5 | 25:bea5a38be938 |
|---|---|
| 195 * @param string $sort_col Sort column | 195 * @param string $sort_col Sort column |
| 196 * @param string $sort_order Sort order | 196 * @param string $sort_order Sort order |
| 197 */ | 197 */ |
| 198 function set_sort_order($sort_col, $sort_order = null) | 198 function set_sort_order($sort_col, $sort_order = null) |
| 199 { | 199 { |
| 200 if ($sort_col != null && ($this->coltypes[$sort_col] || in_array($sort_col, $this->coltypes))) { | 200 if ($sort_col != null && ((!empty($this->coltypes[$sort_col]) || in_array($sort_col, $this->coltypes))) { |
| 201 $this->sort_col = $sort_col; | 201 $this->sort_col = $sort_col; |
| 202 } | 202 } |
| 203 if ($sort_order != null) { | 203 if ($sort_order != null) { |
| 204 $this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC'; | 204 $this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC'; |
| 205 } | 205 } |
