Hypolite Petovan
a99532707b
Resolve conflict
2016-12-20 12:52:24 -05:00
Hypolite Petovan
e8e1f9253d
Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
...
# Conflicts:
# include/follow.php
2016-12-20 12:50:36 -05:00
Hypolite Petovan
177f93f9a5
diaspora.php: Standards, standards everywhere
2016-12-20 12:49:50 -05:00
Hypolite Petovan
155e777d19
replace_people_guid: Break down nested calls
...
- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid
2016-12-20 12:49:32 -05:00
Hypolite Petovan
4a7c3b9eef
Diaspora: Fix class name case + add self
2016-12-20 12:44:15 -05:00
d4c3dcf2fc
Merge pull request #3032 from annando/1612-auth-ejabber
...
Workaround for vanished database connections while authentication
2016-12-20 15:45:18 +01:00
cc16369b6f
Merge pull request #3033 from annando/1612-object-type
...
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
c1193c9c13
Merge pull request #3034 from annando/1612-no-archive
...
Only distribute items to active contacts
2016-12-20 15:42:41 +01:00
4c77ae2fe9
Only distribute items to active contacts
2016-12-20 07:13:22 +00:00
6e46987515
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 07:10:47 +00:00
75711a947e
Workaround for vanished database connections while authentication
2016-12-20 07:08:03 +00:00
Hypolite Petovan
81d003cad1
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-19 23:30:50 -05:00
ff569756ee
Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/follow.php
2016-12-19 09:40:34 +01:00
8cab220387
Bugfix: Reimported Friendica posts from pump.io had the links missing.
2016-12-18 23:39:44 +00:00
3f6fd4bf84
Mastodon: Hopefully we can now detect reshares better
2016-12-18 20:34:34 +00:00
a8e80ef0a6
Ostatus: The follow/unfollow XML should now be even more compliant.
2016-12-18 20:02:13 +00:00
099f51c7b5
Removal of test code
2016-12-18 17:36:48 +00:00
bc323b0bfa
OStatus: Follow/Unfollow should now work again.
2016-12-18 17:10:38 +00:00
f89044ed61
Garrr ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:07:21 +01:00
9c564c4fd3
Again, static *OR* object-referencing calls? Blue or red pill?
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:06:20 +01:00
378cbd9027
Continued with #3010 :
...
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:59:13 +01:00
1c82ad0734
Opps, tpzo found ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:21 +01:00
d4f737577b
And more reverts:
...
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:49:17 +01:00
dea8bef472
more reverts ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:57 +01:00
ba3bc420ca
Also reverted these + added spaces for nicer appearance.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:59 +01:00
53417aaf39
Create missing self contact
2016-12-15 07:15:33 +00:00
9e28f5a0c3
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-14 20:51:38 +01:00
ab50585e9a
reverted change (which duplicated above query), thanks to @annano to point this out. #3010
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:41:56 +01:00
ba45a292c4
3 slashes for Doxygen, 2 are enough for PHP ... :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:18 +01:00
41db906dc4
Continued with #3010 :
...
- removed added debug messages (maybe they will come back in accordance to
code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
(substr($url, 0, 4) !== 'http') on $url = 'https://bla '; will be FALSE
(means found http at start), too.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:02:10 +01:00
307df4ee5c
Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:41:23 +01:00
b5776ab959
Fixes for #3010 :
...
- used static call, still App::get_baseurl() wraps it into an object-referencing
call which seems to be a bit redundant?
- added spaces around dot (see one line below)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:49:52 +01:00
a905522eb5
Cleanup for #3010 - added spaces, thanks to @annando .
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:36 +01:00
a8dc8b288c
import dbm here to avoid adding everywhere the namespace (if later changed,
...
only here it needs change, cool ha? ;-)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 15:24:44 +01:00
797de5bfe0
Nope, get_basepath() should be static, then also mark it as static (in signature).
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 14:53:57 +01:00
63610c7b73
Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/Photo.php
include/api.php
include/cache.php
include/dbstructure.php
include/enotify.php
include/items.php
include/onepoll.php
include/queue_fn.php
include/session.php
include/text.php
mod/contacts.php
mod/dfrn_request.php
mod/display.php
mod/events.php
mod/item.php
mod/message.php
mod/msearch.php
mod/photos.php
mod/poco.php
mod/profile.php
mod/proxy.php
mod/videos.php
update.php
view/theme/diabook/theme.php
view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
6a8a36f12d
More usage of dbm::is_result($r) instead of count($r):
...
- count() returns very different results and never a boolean (not even false on
error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
done in PHP because of its lazyness. But it is discouraged if it comes to
more clean code.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:44:13 +01:00
293436e5fd
Some rewrites:
...
- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
currently the same, it may be changed later)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:16:36 +01:00
73e330abbe
Restore empty line
2016-12-12 06:51:08 +00:00
17f15e793f
Issue 2999: Better Mastodon handling
2016-12-12 06:46:02 +00:00
352b168e2d
Merge pull request #3007 from annando/1607-performance
...
Some more performance stuff
2016-12-12 07:04:16 +01:00
0c99cee092
Some logging to detect possible problems with the probing
2016-12-11 18:39:39 +00:00
5c04402448
String is no integer
2016-12-11 17:37:12 +00:00
c666c98559
Code bautification
2016-12-10 12:28:49 +00:00
00c74a7d6d
Some more ...
2016-12-10 12:21:16 +00:00
5572bd0cf9
Redo the index changes for testing purposes
2016-12-10 12:19:57 +00:00
fc3c1601b1
Merge remote-tracking branch 'upstream/develop' into 1607-performance
2016-12-10 12:18:11 +00:00
Michael Vogel
af42e5e481
Merge pull request #2932 from Hypolite/issue/missing-private-image-src
...
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
4059e58bbf
Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
...
Improve diaspora2bb autolinker
2016-12-08 21:11:47 +01:00
Hypolite Petovan
cd354d3a57
Adding default protocols on missing config value for backward compatibility
2016-12-07 23:18:10 -05:00
