Merge remote-tracking branch 'upstream/develop' into develop

dbm::is_result() calls needed merge Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
parent f844d96a7f 51155d7716
commit d2280d4120
18 changed files with 503 additions and 429 deletions
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -1188,7 +1188,7 @@ function update_suggestions() {

 	$done = array();

-	/// TODO Check if it is really neccessary to poll the own server
+	/// @TODO Check if it is really neccessary to poll the own server
 	poco_load(0,0,0,App::get_baseurl() . '/poco');

 	$done[] = App::get_baseurl() . '/poco';