aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-11-14 00:45:25 +0100
committerKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-11-14 00:45:25 +0100
commite8b77fbdff6cfd9455db378b5edb00fece74fea2 (patch)
tree5f9262cf5e053044df04184cb87192035cf07802
parente4859d4bd70b1649e7ebe4cbb285a0993a837f85 (diff)
downloadvolse-hubzilla-e8b77fbdff6cfd9455db378b5edb00fece74fea2.tar.gz
volse-hubzilla-e8b77fbdff6cfd9455db378b5edb00fece74fea2.tar.bz2
volse-hubzilla-e8b77fbdff6cfd9455db378b5edb00fece74fea2.zip
Fixed a variable conflict in mod/xchan.php.
A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php.
-rwxr-xr-xboot.php2
-rw-r--r--mod/xchan.php19
2 files changed, 10 insertions, 11 deletions
diff --git a/boot.php b/boot.php
index 0feedf7a1..55ae3cc66 100755
--- a/boot.php
+++ b/boot.php
@@ -950,7 +950,7 @@ class App {
foreach($this->widgets as $w) {
if ($w['location'] == $location)
$ret[] = $w;
- }
+ }
$arr = array('location' => $location, 'widgets' => $ret);
call_hooks('get_widgets', $arr);
return $arr['widgets'];
diff --git a/mod/xchan.php b/mod/xchan.php
index 714603f6e..69fbdb77d 100644
--- a/mod/xchan.php
+++ b/mod/xchan.php
@@ -3,16 +3,15 @@
function xchan_content(&$a) {
-
- $o .= '<h3>Xchan Lookup</h3>';
+ $o = '<h3>' . t('Xchan Lookup') . '</h3>';
$o .= '<form action="xchan" method="get">';
- $o .= 'Lookup xchan beginning with (or webbie): <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
- $o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
- $o .= '<br /><br />';
+ $o .= t('Lookup xchan beginning with (or webbie): ');
+ $o .= '<input type="text" style="width:250px;" name="addr" value="' . $_GET['addr'] .'">';
+ $o .= '<input type="submit" name="submit" value="' . t('Submit') .'"></form>';
+ $o .= '<br><br>';
- if(x($_GET,'addr')) {
+ if(x($_GET, 'addr')) {
$addr = trim($_GET['addr']);
$r = q("select * from xchan where xchan_hash like '%s%%' or xchan_addr = '%s' group by xchan_hash",
@@ -22,15 +21,15 @@ function xchan_content(&$a) {
if($r) {
foreach($r as $rr) {
- $o .= str_replace(array("\n"," "),array("<br/>","&nbsp;"),print_r($rr,true)) . EOL;
+ $o .= str_replace(array("\n", " "), array("<br>", "&nbsp;"), print_r($rr, true)) . EOL;
$s = q("select * from hubloc where hubloc_hash like '%s'",
dbesc($r[0]['xchan_hash'])
);
if($s) {
- foreach($s as $rr)
- $o .= str_replace(array("\n"," "),array("<br/>","&nbsp;"),print_r($rr,true)) . EOL;
+ foreach($s as $rrr)
+ $o .= str_replace(array("\n", " "), array("<br>", "&nbsp;"), print_r($rrr, true)) . EOL;
}
}
}