aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-16 17:01:41 -0800
committerfriendica <info@friendica.com>2015-02-16 17:01:41 -0800
commit3d9273afad8645e2c3a063e797c0ac58c2cba2eb (patch)
tree7f6ef741621b57dc4ed42b9ca8c94fdf082c4fda
parent533f39debe494dc826570ff030fcda35041d9038 (diff)
parente0c9929325c4c4493e76f3e6dfe7c4ada63a55ea (diff)
downloadvolse-hubzilla-3d9273afad8645e2c3a063e797c0ac58c2cba2eb.tar.gz
volse-hubzilla-3d9273afad8645e2c3a063e797c0ac58c2cba2eb.tar.bz2
volse-hubzilla-3d9273afad8645e2c3a063e797c0ac58c2cba2eb.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/api.php4
-rw-r--r--include/zot.php9
-rw-r--r--view/theme/redbasic/js/redbasic.js4
3 files changed, 13 insertions, 4 deletions
diff --git a/include/api.php b/include/api.php
index d5c2a429c..d0c4ed0aa 100644
--- a/include/api.php
+++ b/include/api.php
@@ -808,8 +808,8 @@ require_once('include/items.php');
require_once('include/security.php');
- $lastwall = q("SELECT * from item where 1
- and item_private = 0 and item_restrict = 0
+ $lastwall = q("SELECT * from item where
+ item_private = 0 and item_restrict = 0
and author_xchan = '%s'
and allow_cid = '' and allow_gid = '' and deny_cid = '' and deny_gid = ''
and verb = '%s'
diff --git a/include/zot.php b/include/zot.php
index 926764635..852376c4b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -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",
dbesc($hash)
);
+
+ $age = intval($arr['xprof_age']);
+ if($age > 150)
+ $age = 150;
+
if($r) {
$update = false;
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'",
dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']),
- intval($arr['xprof_age']),
+ $age,
dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']),
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_desc']),
dbesc($arr['xprof_dob']),
- intval($arr['xprof_age']),
+ $age,
dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']),
dbesc($arr['xprof_sexual']),
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 4f70752c0..53ee45648 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -1,6 +1,10 @@
$(document).ready(function() {
+if($(window).width() < 767) {
+ $('main').css('width', $(window).width() + 231 );
+}
+
$('#expand-aside').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
$('main').toggleClass('region_1-on');