Fix formatting and PHP notice in mod/photos

[friendica.git] / mod / msearch.php

diff --git a/mod/msearch.php b/mod/msearch.php
index ba7a92d64e26fa697043b4d1e230d1bea38cc278..a652bc8ed87b92d86a646a3043b932b1f79ea65a 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,6 +1,10 @@
 <?php
 
-function msearch_post(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
+function msearch_post(App $a) {
 
        $perpage = (($_POST['n']) ? $_POST['n'] : 80);
        $page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
@@ -14,7 +18,7 @@ function msearch_post(&$a) {
                dbesc($search)
        );
 
-       if (dbm::is_result($r))
+       if (DBM::is_result($r))
                $total = $r[0]['total'];
 
        $results = array();
@@ -25,12 +29,12 @@ function msearch_post(&$a) {
                intval($perpage)
        );
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach($r as $rr)
                        $results[] = array(
-                               'name' => $rr['name'], 
-                               'url' => App::get_baseurl() . '/profile/' . $rr['nickname'], 
-                               'photo' => App::get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
+                               'name' => $rr['name'],
+                               'url' => System::baseUrl() . '/profile/' . $rr['nickname'],
+                               'photo' => System::baseUrl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
                                'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
                        );
        }