Redo some work

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 8d3b6a8050199ec5ec4d78ea0982af902e3a2316..77a9f25af9578f4909d0595f290d8b32e6fd1544 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -276,7 +276,7 @@ if(! function_exists('paginate_data')) {
  * @param int $count [optional] item count (used with alt pager)
  * @return Array data for pagination template
  */
-function paginate_data(&$a, $count=null) {
+function paginate_data(App $a, $count=null) {
        $stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
 
        $stripped = str_replace('q=','',$stripped);
@@ -369,7 +369,7 @@ if(! function_exists('paginate')) {
  * @param App $a App instance
  * @return string html for pagination #FIXME remove html
  */
-function paginate(App &$a) {
+function paginate(App $a) {
 
        $data = paginate_data($a);
        $tpl = get_markup_template("paginate.tpl");
@@ -384,7 +384,7 @@ if(! function_exists('alt_pager')) {
  * @param int $i
  * @return string html for pagination #FIXME remove html
  */
-function alt_pager(&$a, $i) {
+function alt_pager(App $a, $i) {
 
        $data = paginate_data($a, $i);
        $tpl = get_markup_template("paginate.tpl");
@@ -912,7 +912,7 @@ function contact_block() {
                        if (dbm::is_result($r)) {
                                $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
                                $micropro = Array();
-                               foreach($r as $rr) {
+                               foreach ($r as $rr) {
                                        $micropro[] = micropro($rr,true,'mpfriend');
                                }
                        }
@@ -1717,7 +1717,7 @@ function bb_translate_video($s) {
 
        $matches = null;
        $r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER);
-       if($r) {
+       if ($r) {
                foreach($matches as $mtch) {
                        if((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be')))
                                $s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s);