clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into task/admin-block-list

Browse Source
This commit is contained in:
Hypolite Petovan
2017-12-01 00:48:13 -05:00
committed by GitHub
parent dc09319695 0ae6f571da
commit ff459441cf
29 changed files with 742 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
view/theme/frio/theme.php
+3 -3
View File
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Object\Photo;
$frio = "view/theme/frio";
@@ -79,9 +80,8 @@ function frio_uninstall() {
* @param App $a Unused but required by hook definition
* @param array $body_info The item and its html output
*/
function frio_item_photo_links(App $a, &$body_info) {
require_once('include/Photo.php');
function frio_item_photo_links(App $a, &$body_info)
{
$phototypes = Photo::supportedTypes();
$occurence = 1;
$p = bb_find_open_close($body_info['html'], "<a", ">");
view/theme/frost/theme.php
+3 -2
View File
@@ -11,6 +11,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Object\Photo;
function frost_init(App $a) {
$a->videowidth = 400;
@@ -45,8 +46,8 @@ function frost_uninstall() {
logger("uninstalled theme frost");
}
function frost_item_photo_links(App $a, &$body_info) {
require_once('include/Photo.php');
function frost_item_photo_links(App $a, &$body_info)
{
$phototypes = Photo::supportedTypes();
$occurence = 1;