@@ -55,25 +55,28 @@ public static function Count($table, $columns, $additional_query = '')
55
55
return $ rows ;
56
56
}
57
57
58
- public static function Get ($ start , $ items_per_page , $ sort , $ table , $ columns , $ additional_query = '' , $ single = false , $ additional_columns = '' , $ attachments = [])
58
+ public static function Get ($ start , $ items_per_page , $ sort , $ table , $ columns , $ additional_query = '' , $ single = false , $ additional_columns = '' , $ more_values = [], $ attachments = [])
59
59
{
60
60
global $ smcFunc ;
61
61
62
62
$ columns = implode (', ' , $ columns );
63
- $ result = $ smcFunc ['db_query ' ]('' , '
64
- SELECT ' . $ columns . '
65
- FROM {db_prefix}{raw:table} ' .
66
- $ additional_columns . '
67
- {raw:where} ' . (empty ($ single ) ? '
68
- ORDER by {raw:sort}
69
- LIMIT {int:start}, {int:maxindex} ' : '' ),
63
+ $ data = array_merge (
70
64
[
71
65
'table ' => $ table ,
72
66
'start ' => $ start ,
73
67
'maxindex ' => $ items_per_page ,
74
68
'sort ' => $ sort ,
75
- 'where ' => $ additional_query ,
76
- ]
69
+ ],
70
+ $ more_values
71
+ );
72
+ $ result = $ smcFunc ['db_query ' ]('' , '
73
+ SELECT ' . $ columns . '
74
+ FROM {db_prefix}{raw:table} ' .
75
+ $ additional_columns . '
76
+ ' . $ additional_query . (empty ($ single ) ? '
77
+ ORDER BY {raw:sort}
78
+ LIMIT {int:start}, {int:maxindex} ' : '' ),
79
+ $ data
77
80
);
78
81
79
82
// Single?
@@ -91,23 +94,26 @@ public static function Get($start, $items_per_page, $sort, $table, $columns, $ad
91
94
return $ items ;
92
95
}
93
96
94
- public static function Nested ($ sort , $ table , $ column_main , $ column_sec , $ query_member , $ additional_query = '' , $ additional_columns = '' , $ attachments = [], $ attach_main = false )
97
+ public static function Nested ($ sort , $ table , $ column_main , $ column_sec , $ query_member , $ additional_query = '' , $ additional_columns = '' , $ more_values = [], $ attachments = [], $ attach_main = false )
95
98
{
96
99
global $ smcFunc ;
97
100
98
101
$ columns = array_merge (array_merge ($ column_main , $ column_sec ), $ attachments );
99
102
$ columns = implode (', ' , $ columns );
103
+ $ data = array_merge (
104
+ [
105
+ 'table ' => $ table ,
106
+ 'sort ' => $ sort ,
107
+ ],
108
+ $ more_values
109
+ );
100
110
$ result = $ smcFunc ['db_query ' ]('' , '
101
111
SELECT ' . $ columns . '
102
112
FROM {db_prefix}{raw:table} ' .
103
113
$ additional_columns . '
104
- {raw:where}
114
+ ' . $ additional_query . '
105
115
ORDER by {raw:sort} ' ,
106
- [
107
- 'table ' => $ table ,
108
- 'sort ' => $ sort ,
109
- 'where ' => $ additional_query ,
110
- ]
116
+ $ data
111
117
);
112
118
113
119
$ items = [];
0 commit comments