Commit graph

13646 commits

Author SHA1 Message Date
Roland Häder 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
Michael Vogel fd1afcbd35 Merge pull request #3025 from tobiasd/20161219-messagespo
regenerated master messages.po file
2016-12-19 08:40:49 +01:00
Tobias Diekershoff 5507a2caeb regenerated master messages.po file 2016-12-19 07:47:52 +01:00
Tobias Diekershoff 6aba536957 Merge pull request #3023 from annando/1612-attachment-link
Bugfix: Reimported Friendica posts from pump.io had the links missing.
2016-12-19 07:44:42 +01:00
Tobias Diekershoff 5a4c5ac8f7 Merge pull request #3024 from beardyunixer/develop
This error message had me confused for about twenty minutes.  I couldn't
2016-12-19 07:44:10 +01:00
Thomas Willingham a58d8d2c71 This error message had me confused for about twenty minutes. I couldn't
figure out what was wrong with my imagick install that would make it give
me an orange button if it was installed.  Of course, the problem was that
it wasn't installed, and the message was worded badly.  This is a bit less
confusing.
2016-12-19 00:10:11 +00:00
Michael 8cab220387 Bugfix: Reimported Friendica posts from pump.io had the links missing. 2016-12-18 23:39:44 +00:00
Tobias Diekershoff b3fa0a4e90 Merge pull request #3022 from annando/1612-ostatus-follow2
Ostatus: The follow/unfollow XML should now be even more compliant.
2016-12-18 22:27:02 +01:00
Michael 3f6fd4bf84 Mastodon: Hopefully we can now detect reshares better 2016-12-18 20:34:34 +00:00
Michael a8e80ef0a6 Ostatus: The follow/unfollow XML should now be even more compliant. 2016-12-18 20:02:13 +00:00
Tobias Diekershoff 463a80e91d Merge pull request #3021 from annando/1612-ostatus-follow
OStatus: Follow/Unfollow should now work again.
2016-12-18 19:11:34 +01:00
Michael 099f51c7b5 Removal of test code 2016-12-18 17:36:48 +00:00
Michael bc323b0bfa OStatus: Follow/Unfollow should now work again. 2016-12-18 17:10:38 +00:00
Tobias Diekershoff e92135a2dc Merge pull request #3014 from annando/1612-missing-self-contact
Create missing self contact
2016-12-15 18:44:44 +01:00
Roland Häder a126db451c Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:12:00 +01:00
Roland Häder f89044ed61 Garrr ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:07:21 +01:00
Roland Häder 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
Roland Häder c43e9aa74e get_basepath() uses a lot $this (which means object-referenced calls, or
non-static calls). but still it is called statically in many places.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:06:12 +01:00
Roland Häder 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
Roland Häder 1c82ad0734 Opps, tpzo found ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:21 +01:00
Roland Häder 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
Roland Häder dea8bef472 more reverts ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:57 +01:00
Roland Häder 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
Michael 53417aaf39 Create missing self contact 2016-12-15 07:15:33 +00:00
Roland Häder 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
Roland Häder 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
Roland Häder 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
Roland Häder 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
Roland Häder 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
Roland Häder a31acb5fda Opps, this has vanished by accident, thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:41:16 +01:00
Roland Häder 582b8db8e8 Maybe no longer needed: converted $a->get_baseurl() to App::get_baseurl(). #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 11:55:12 +01:00
Roland Häder cee169997e Opps, no && and AND in same line (confusing, thanks to @annando)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 10:02:39 +01:00
Roland Häder 042ed17826 removed own debug lines (no more needed).
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:58:27 +01:00
Roland Häder 036edc2fd0 added extra spaces to make it look nice. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:56:27 +01:00
Roland Häder 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
Roland Häder 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
Roland Häder 448c5aa694 Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:28 +01:00
Roland Häder 46d383369c Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:41:33 +01:00
Roland Häder dd8d797d9f Fixes for #3010 - removed baseurl as this is no longer done, still there are 89
left in templates.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:34:13 +01:00
Roland Häder 6de232c60a Cleanup for #3010 - removed all redundant lines found by @rabuzarus
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:31:27 +01:00
Roland Häder 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
Roland Häder 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
Roland Häder 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
Roland Häder 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
Roland Häder 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
Roland Häder 47c60aa486 Opps, no need for this.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:01:56 +01:00
Roland Häder d489ba1510 Merge remote-tracking branch 'upstream/develop' into develop
Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/ping.php
	view/lang/fr/messages.po
	view/lang/fr/strings.php
2016-12-13 09:59:43 +01:00
Tobias Diekershoff 29bc27fa6a Merge pull request #3009 from annando/issue-2999
Issue 2999: Better Mastodon handling
2016-12-12 07:54:59 +01:00
Michael 73e330abbe Restore empty line 2016-12-12 06:51:08 +00:00
Michael 17f15e793f Issue 2999: Better Mastodon handling 2016-12-12 06:46:02 +00:00