Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 13:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5431 from MrPetovan/task/5410-rename-database-methods

Browse source 
Move DBA to src/ part 3.1: Rename DBA methods
This commit is contained in:
Michael Vogel 2018-07-23 15:18:58 +02:00 • committed by GitHub
commit 2d0a749734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 142 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/admin.php
View file

@ -479,7 +479,7 @@ function admin_page_contactblock(App $a)
$statement = DBA::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
$contacts = DBA::inArray($statement);
$contacts = DBA::toArray($statement);
$t = get_markup_template('admin/contactblock.tpl');
$o = replace_macros($t, [
@ -782,7 +782,7 @@ function admin_page_workerqueue(App $a)
{
// get jobs from the workerqueue table
$statement = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
$r = DBA::inArray($statement);
$r = DBA::toArray($statement);
for($i = 0; $i < count($r); $i++) {
$r[$i]['parameter'] = implode(json_decode($r[$i]['parameter']), ': ');
@ -816,7 +816,7 @@ function admin_page_workerqueue(App $a)
function admin_page_summary(App $a)
{
// are there MyISAM tables in the DB? If so, trigger a warning message
$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(DBA::database_name()));
$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(DBA::databaseName()));
$showwarning = false;
$warningtext = [];
if (DBM::is_result($r)) {