Commit graph

3715 commits

Author SHA1 Message Date
Alexandre Alapetite 38e7a0f793 Fix GROUP BY for search
https://github.com/friendica/friendica/issues/3322
Fix MySQL ERROR 1055 (42000): Expression #1 of SELECT list is not in
GROUP BY clause and contains nonaggregated column
'friendica.item.author-id' which is not functionally dependent on
columns in GROUP BY clause; this is incompatible with
sql_mode=only_full_group_by
2017-04-12 22:55:02 +02:00
Alexandre Alapetite 534ea6aefc Fix ping_init SQL
According to review
https://github.com/friendica/friendica/pull/3323#pullrequestreview-32401628
2017-04-12 18:54:54 +02:00
Alexandre Alapetite 9fb4ba2b73 Fix profile wrong DISTINCT + ORDER BY
Fix: ERROR 3065 (HY000) Expression #1 of ORDER BY clause is not in
SELECT list, references column 'friendica.item.created' which is not in
SELECT list; this is incompatible with DISTINCT
2017-04-12 18:49:29 +02:00
Alexandre Alapetite 74b6d09e89 Fix GROUP BY in acl_selector, api, notifier, photos, messages
https://github.com/friendica/friendica/issues/3322
2017-04-12 15:11:50 +02:00
Alexandre Alapetite c3e933642e Fix missing SQL group by in ping
https://github.com/friendica/friendica/issues/3322
2017-04-12 14:17:16 +02:00
Hypolite Petovan ffbf330585 Merge pull request #3310 from annando/1704-probing
Avoid possible problems with numeric nicknames and GNU Social
2017-04-09 01:08:12 -04:00
Michael 5c75fe4c14 Avoid possible problems with numeric nicknames and GNU Social 2017-04-09 04:29:02 +00:00
Hypolite Petovan 472345d740 Merge branch 'develop' into space_before_t 2017-04-08 23:17:31 -04:00
rebeka-catalina 050675a629 The other lone comma in 1177 2017-04-08 18:07:30 +02:00
rebeka-catalina 554704e6b9 Added a whitespace between comma and t() 2017-04-08 16:57:24 +02:00
rebeka-catalina d8a8fa9baa Modified the warning message 2017-04-08 16:48:11 +02:00
rebeka-catalina 7320327fa1 Deleted the lone comma between paratheses 2017-04-08 16:37:18 +02:00
rebeka-catalina 895a6254a0 Correction of 1177 and added modification to 1171 2017-04-08 15:48:15 +02:00
rebeka-catalina bcfbfeeba4 adding space for readability 2017-04-08 13:52:37 +02:00
rebeka-catalina 4c9c83e8e8 Warning, that profile published in local directory may be visible in public 2017-04-08 13:21:35 +02:00
rebeka-catalina 892ef45474 Warning, that profile published in local directory may be visible in public 2017-04-08 13:13:38 +02:00
Hypolite Petovan cfb99aa323 Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser
frio: fbrowser styling
2017-04-07 00:01:46 -04:00
Michael 407e25e7d6 Some little standard stuff 2017-04-04 05:39:43 +00:00
Michael a0216af4bb Issue 1720: Group filter and new tab don't like each other 2017-04-04 05:35:04 +00:00
rabuzarus ee293f2ce2 Merge develop into 20170321_-_frio-fbbrowser
Conflicts:
	view/theme/frio/js/filebrowser.js
	view/theme/frio/js/theme.js
	view/theme/frio/templates/filebrowser.tpl
	view/theme/frio/templates/jot.tpl
2017-04-03 00:51:34 +02:00
Roland Häder 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
Roland Häder 3cea176ef2
added spaces + used x ()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-01 22:12:53 +02:00
Michael 240a0961c6 Standards ... 2017-04-01 17:08:11 +00:00
Michael f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Roland Häder 60552260e1
Continued with CR:
- added spaces as requested
- removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 21:04:39 +02:00
Roland Häder d4e67338d8
space-time contines ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:56:43 +02:00
Roland Häder 18ca141f5c
space-time!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:52:43 +02:00
Roland Häder 44a137a8de
Continued a bit:
- converted multiple single-line comments into one multi-line comment
- added spaces (space-time!)

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:51:47 +02:00
Roland Häder 07a0d300c3
added space, marked rest 86 occurrences in todos.txt
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:49:58 +02:00
Roland Häder 9cfcf8f7ca
added spaces, marked in todos.txt as usual
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:47:44 +02:00
Roland Häder eab654dd65
$tagged is being initialized but not written to until the foreach() loop is
being executed. Maybe here is old-lost code anyway?

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:45:15 +02:00
Roland Häder 8824da8962
Continued a bit:
- recommended way is to use foreach() instead of own looping through arrays
- even when you need the index:
<?php
foreach ($someArray as $key => $value) {
	// Handle $key/$value somehow
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:37:01 +02:00
Roland Häder 6db3d72ee3
added spaces (space-time!) and TODO that x() is maybe proper way?
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:33:11 +02:00
Roland Häder d98ac6b42d
Continued a bit:
- removed parentheses from include/require as they are no functions
- added type-hint for $a which is unused btw.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 20:31:00 +02:00
Roland Häder 0bc15efef6
whoops, parser error fixed
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:51:42 +02:00
Roland Häder 192f6d7cf4
merged 2 if() into one three times
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:49:03 +02:00
Roland Häder de5125a4c7
merged 2 if() into one as requested by CR
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:45:49 +02:00
Roland Häder 2a480df6fa
added spaces + removed parentheses (include/require are no functions)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:44:55 +02:00
Roland Häder 6b8f581897
added spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:42:09 +02:00
Roland Häder f998438d43
removed old-lost code by CR request
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:38:36 +02:00
Roland Häder 5bc2ebb267
Please use x() correctly:
<?php
if (x($someArray, 'element')) {
	// Do something
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:37:08 +02:00
Roland Häder 3d595c4dcc
Continued a bit:
- added spaces / curly braces
- converted multiple single-line comments into one multi-line comment
- used more dbm::is_result()
- include/require are no functions, let's not abuse them ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:33:24 +02:00
Roland Häder d091759888
space to the rescue ... ;-) CR request
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:34:14 +02:00
Roland Häder 9c056d0bf0
it is ... SPACE TIME! ;-)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:30:35 +02:00
Roland Häder e0f4d22049
removed old-lost code by CR request + spaces added ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 20:26:50 +02:00
Hypolite Petovan 55e4bab00e Improve babel page display for diaspora2bb mode
- Fix formatting
2017-03-26 19:06:22 -04:00
Michael 8fe1fc2f52 Remove parendingsdas 2017-03-26 13:12:02 +00:00
Michael 92f5315320 We now return basic system data via nodeinfo at every time. 2017-03-26 12:51:25 +00:00
Michael 4168d47ecd Issue 3248: Make communityhome work again. 2017-03-26 05:29:24 +00:00
rabuzarus b6ab3bdd36 make use of Config class 2017-03-25 21:07:12 +01:00