MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Hypolite Petovan 2017-12-01 21:39:20 -05:00
parent 2fe80e051b 558f9d263d
commit 843ec842c3
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mod/network.php
View file

@ -42,6 +42,7 @@ function network_init(App $a) {
$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0); $group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
$cid = 0;
if (x($_GET, 'cid') && intval($_GET['cid']) != 0) { if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
$cid = $_GET['cid']; $cid = $_GET['cid'];
$_GET['nets'] = 'all'; $_GET['nets'] = 'all';
@ -883,17 +884,19 @@ function networkThreadedView(App $a, $update = 0) {
* @param App $a The global App * @param App $a The global App
* @return string Html of the networktab * @return string Html of the networktab
*/ */
function network_tabs(App $a) { function network_tabs(App $a)
{
// item filter tabs // item filter tabs
/// @TODO fix this logic, reduce duplication /// @TODO fix this logic, reduce duplication
/// $a->page['content'] .= '<div class="tabs-wrapper">'; /// $a->page['content'] .= '<div class="tabs-wrapper">';
list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a); list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
// if no tabs are selected, defaults to comments
if ($no_active=='active') $all_active='active';
$cmd = (($datequery) ? '' : $a->cmd); // if no tabs are selected, defaults to comments
$len_naked_cmd = strlen(str_replace('/new','',$cmd)); if ($no_active == 'active') {
$all_active = 'active';
}
$cmd = $a->cmd;
// tabs // tabs
$tabs = array( $tabs = array(

1
scripts/dbstructure.php
View file

@ -7,6 +7,7 @@
require_once 'include/dbstructure.php'; require_once 'include/dbstructure.php';
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));

2
src/Core/Config.php
View file

@ -159,7 +159,7 @@ class Config
// manage array value // manage array value
$dbvalue = (is_array($value) ? serialize($value) : $dbvalue); $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
dba::update('config', array('v' => $dbvalue), array('cat' => $family, 'k' => $key), true); $ret = dba::update('config', array('v' => $dbvalue), array('cat' => $family, 'k' => $key), true);
if ($ret) { if ($ret) {
self::$in_db[$family][$key] = true; self::$in_db[$family][$key] = true;

1
src/Object/Photo.php
View file

@ -11,6 +11,7 @@ use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use dba; use dba;
use Exception;
use Imagick; use Imagick;
use ImagickPixel; use ImagickPixel;