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

Merge branch 'master' of https://github.com/redmatrix/hubzilla

Browse Source
This commit is contained in:
Mario Vavti 2015-12-02 09:44:42 +01:00
commit 857e13e9b8
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/api.php
View File

@ -382,7 +382,6 @@ require_once('include/api_auth.php');
function api_item_get_user(&$a, $item) { function api_item_get_user(&$a, $item) {
global $usercache;
// The author is our direct contact, in a conversation with us. // The author is our direct contact, in a conversation with us.
@ -396,11 +395,11 @@ require_once('include/api_auth.php');
$name = $item['author']['xchan_name']; $name = $item['author']['xchan_name'];
// Generating a random ID // Generating a random ID
if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache)) if (! $nick)
$usercache[$nick] = mt_rand(2000000, 2100000); $nick = mt_rand(2000000, 2100000);
$ret = array( $ret = array(
'id' => $usercache[$nick], 'id' => $nick,
'name' => $name, 'name' => $name,
'screen_name' => $nick, 'screen_name' => $nick,
'location' => '', //$uinfo[0]['default-location'], 'location' => '', //$uinfo[0]['default-location'],

2
include/items.php
View File

@ -3474,7 +3474,7 @@ function post_is_importable($item,$abook) {
unobscure($item); unobscure($item);
$text = prepare_text($item['body'],$item['mimetype']); $text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text); $text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text);
$lang = null; $lang = null;

7
util/update_addon_repo
View File

@ -7,7 +7,12 @@ if [ $# -ne 1 ]; then
exit 1 exit 1
fi fi
cd extend/addon/$1 if [ -d extend/addon/$1 ] ; then
cd extend/addon/$1
else
echo "$1 not found. Aborting..."
exit 1
fi
if [ -d .git ] ; then if [ -d .git ] ; then
git pull git pull

2
version.inc
View File

@ -1 +1 @@
2015-11-30.1232 2015-12-01.1233