4c04a78d1b
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 09:03:44 +01:00
rabuzarus
2fcbba9410
provide local time for notifications
2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd
frio: add profile link to the notifications url
2016-12-21 23:17:55 +01:00
59404e4eaf
More curly braces added, left some TODOs behind
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:17:36 +01:00
d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:12:28 +01:00
e6a4a736fc
no need for this else block
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 22:53:08 +01:00
7f98c8086c
added curly braces + space
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/events.php
2016-12-21 09:31:31 +01:00
b580c23844
Merge remote-tracking branch 'upstream/develop' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/proxy.php
2016-12-21 09:11:58 +01:00
7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl().
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:25 +01:00
9814414b6a
used dbm::is_result() instead of count()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:39:06 +01:00
536f078ed4
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:31:05 +01:00
Hypolite Petovan
e54ee2e509
Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension
...
# Conflicts:
# include/follow.php
2016-12-20 15:29:30 -05:00
Hypolite Petovan
b2768d8f1c
proxy mod: Standards bearer
...
- Enforced PSR-2 standards
- Normalized concatenation formatting
- Normalized string delimiters
- Normalized condition operators
- Collapsed directly nested conditions
- Used dvm::is_result
- Added comments
2016-12-20 15:23:08 -05:00
6e44acfed6
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:15:53 +01:00
Hypolite Petovan
6e929934c5
proxy: Simplify url extension extraction
2016-12-20 15:14:43 -05:00
b6d11f2129
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-20 19:33:40 +01:00
4b221d216e
added more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 17:57:40 +01:00
Michael Vogel
7141ce9163
Merge pull request #3030 from Hypolite/bug/proxy_url_extension
...
proxy_url: Fix extension extraction for URLs containing a . after a ?
2016-12-20 17:53:26 +01:00
b9e4b9f274
Merge remote-tracking branch 'upstream/develop' into develop
...
Changes in #3034 were somehow conflicting. :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
2016-12-20 15:44:31 +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
51716957b2
converted more to dbm::is_result() + added braces/space
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 15:37:27 +01:00
0e58bf6675
Changed $a->get_baseurl() to App::get_baseurl()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:45:16 +01:00
d5f2d387bd
Continued a bit:
...
- added more curly braces around conditional blocks
- added space between "if" and brace
- aligned "=>" (will do with more if wanted)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:42:33 +01:00
c22878643b
Opps, forgot this ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:38:11 +01:00
8d28135c59
added curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:35:18 +01:00
e24c3a5b82
added much more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
51d352922a
Continued:
...
- added curly braces + spaces
- added todo about testing empty/non-empty strings
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:39:53 +01:00
5588472f6d
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:16 +01:00
c86f09a894
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:03 +01:00
c1845c97cc
added more curly braces + fixed space->tab for code indentation.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:33:04 +01:00
507db84243
added curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:27:40 +01:00
9c097c20dd
added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:21:32 +01:00
4299cce719
added curly braces + space between "if" and brace + added missing @param
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:18:54 +01:00
40bdc5d33c
added curly braces + space between "if" and brace + added TODO
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:14:30 +01:00
92ad87590b
added curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:04:29 +01:00
4dce3d8224
changed to this:
...
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:55 +01:00
be35349495
added more curyl braces + spaces between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:27 +01:00
064b53e673
Coding convention:
...
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:39:06 +01:00
a5e4882e25
Coding convention:
...
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:35:28 +01:00
5a90e7f822
Continued a bit:
...
- converted some bad checks to use dbm::is_result()
- added space between "if" and brace
- added curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:20:10 +01:00
fb676335db
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:10:33 +01:00
6e46987515
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 07:10:47 +00:00
Hypolite Petovan
403d1f987f
proxy_url: Fix extension extraction for URLs containing a . after a ?
2016-12-19 20:19:26 -05:00
dac1dbd3e9
Merge branch 'rewrites/dbm_is_result' into develop
2016-12-19 14:47:05 +01:00
a96eb3428d
Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are
...
more pending ...
Also put SQL table columns into back-ticks.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:46:33 +01:00
884f44ce94
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
4615f39836
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-19 14:21:26 +01: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
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
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
