harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-02-16 17:01:41 -08:00
commit 3d9273afad
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/api.php
View File

@ -808,8 +808,8 @@ require_once('include/items.php');
require_once('include/security.php'); require_once('include/security.php');
$lastwall = q("SELECT * from item where 1 $lastwall = q("SELECT * from item where
and item_private = 0 and item_restrict = 0 item_private = 0 and item_restrict = 0
and author_xchan = '%s' and author_xchan = '%s'
and allow_cid = '' and allow_gid = '' and deny_cid = '' and deny_gid = '' and allow_cid = '' and allow_gid = '' and deny_cid = '' and deny_gid = ''
and verb = '%s' and verb = '%s'

9
include/zot.php
View File

@ -2243,6 +2243,11 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
$r = q("select * from xprof where xprof_hash = '%s' limit 1", $r = q("select * from xprof where xprof_hash = '%s' limit 1",
dbesc($hash) dbesc($hash)
); );
$age = intval($arr['xprof_age']);
if($age > 150)
$age = 150;
if($r) { if($r) {
$update = false; $update = false;
foreach($r[0] as $k => $v) { foreach($r[0] as $k => $v) {
@ -2271,7 +2276,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
where xprof_hash = '%s'", where xprof_hash = '%s'",
dbesc($arr['xprof_desc']), dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']), dbesc($arr['xprof_dob']),
intval($arr['xprof_age']), $age,
dbesc($arr['xprof_gender']), dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']), dbesc($arr['xprof_marital']),
dbesc($arr['xprof_sexual']), dbesc($arr['xprof_sexual']),
@ -2294,7 +2299,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
dbesc($arr['xprof_hash']), dbesc($arr['xprof_hash']),
dbesc($arr['xprof_desc']), dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']), dbesc($arr['xprof_dob']),
intval($arr['xprof_age']), $age,
dbesc($arr['xprof_gender']), dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']), dbesc($arr['xprof_marital']),
dbesc($arr['xprof_sexual']), dbesc($arr['xprof_sexual']),

4
view/theme/redbasic/js/redbasic.js
View File

@ -1,6 +1,10 @@
$(document).ready(function() { $(document).ready(function() {
if($(window).width() < 767) {
$('main').css('width', $(window).width() + 231 );
}
$('#expand-aside').click(function() { $('#expand-aside').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
$('main').toggleClass('region_1-on'); $('main').toggleClass('region_1-on');