diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-13 22:41:45 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-13 22:41:45 -0400 |
| commit | a2073bcfc05abadc3e967f40c66d1fa674bba0d3 (patch) | |
| tree | 6f0412fba9934257465217c9cae283b626d7fb70 /mod/message.php | |
| parent | 1763a6c9c2a80642291e13f80be8a092465924ae (diff) | |
| parent | de017d1ed76500c01fd11c8e1d36cf4ebd70172d (diff) | |
| download | volse-hubzilla-a2073bcfc05abadc3e967f40c66d1fa674bba0d3.tar.gz volse-hubzilla-a2073bcfc05abadc3e967f40c66d1fa674bba0d3.tar.bz2 volse-hubzilla-a2073bcfc05abadc3e967f40c66d1fa674bba0d3.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
sort inbox by recently replied conversations first
file as widget and basic filing implementation for duepuntozero,slackr much more work needed - this is just for test/evaluation currently
don't count self in number of contatcs
invite potential connectees to the free social web
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
Some security against XSRF-attacks
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
Avoid notices
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
wasn't actually changed before
Avoid a notice
Avoid a Notice
Avoid a Notice
Avoid a Notice
* master:
Diffstat (limited to 'mod/message.php')
| -rwxr-xr-x | mod/message.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/message.php b/mod/message.php index 57d45ee3c..65f692f3d 100755 --- a/mod/message.php +++ b/mod/message.php @@ -192,9 +192,9 @@ function message_content(&$a) { $a->set_pager_total($r[0]['total']); $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` + `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval(local_user()), dbesc($myprofile), intval($a->pager['start']), |