keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  bug #329 - compress the plugin list on the friendica info page
  bug #346 - add oembed maxwidth to oembed request

* master:
This commit is contained in:
Simon L'nu 2012-03-25 00:59:25 -04:00
commit 5bd4f62210
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/oembed.php
View file

@ -38,7 +38,8 @@ function oembed_fetch_url($embedurl){
$entries = $xpath->query("//link[@type='application/json+oembed']"); $entries = $xpath->query("//link[@type='application/json+oembed']");
foreach($entries as $e){ foreach($entries as $e){
$href = $e->getAttributeNode("href")->nodeValue; $href = $e->getAttributeNode("href")->nodeValue;
$txt = fetch_url($href); $txt = fetch_url($href . '&maxwidth=425');
break;
} }
} }
} }
@ -46,7 +47,7 @@ function oembed_fetch_url($embedurl){
if ($txt==false || $txt==""){ if ($txt==false || $txt==""){
// try oohembed service // try oohembed service
$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl); $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425';
$txt = fetch_url($ourl); $txt = fetch_url($ourl);
} }

19
mod/friendica.php
View file

@ -51,15 +51,20 @@ function friendica_content(&$a) {
$o .= '<p></p>'; $o .= '<p></p>';
if(count($a->plugins)) { if(count($a->plugins)) {
$o .= '<p>' . t('Installed plugins/addons/apps') . '</p>'; $o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>';
$o .= '<ul>'; $sorted = $a->plugins;
foreach($a->plugins as $p) $s = '';
if(strlen($p)) sort($sorted);
$o .= '<li>' . $p . '</li>'; foreach($sorted as $p) {
$o .= '</ul>'; if(strlen($p)) {
if(strlen($s)) $s .= ', ';
$s .= $p;
}
}
$o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>';
} }
else else
$o .= '<p>' . t('No installed plugins/addons/apps'); $o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
call_hooks('about_hook', $o); call_hooks('about_hook', $o);