Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update to the German strings
  add network_tabs hook
  pass autoname(0) test
  rev update
  added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.

* master:

92 files changed, 6 insertions, 2 deletions

diff --git a/mod/acl.php b/mod/acl.php
index fe353d1eb..fe353d1eb 100755..100644
--- a/mod/acl.php
+++ b/mod/acl.php
diff --git a/mod/admin.php b/mod/admin.php
index a395027c1..a395027c1 100755..100644
--- a/mod/admin.php
+++ b/mod/admin.php
diff --git a/mod/allfriends.php b/mod/allfriends.php
index f675b8e29..f675b8e29 100755..100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
diff --git a/mod/amcd.php b/mod/amcd.php
index a2a1327e6..a2a1327e6 100755..100644
--- a/mod/amcd.php
+++ b/mod/amcd.php
diff --git a/mod/api.php b/mod/api.php
index ad75e6620..ad75e6620 100755..100644
--- a/mod/api.php
+++ b/mod/api.php
diff --git a/mod/apps.php b/mod/apps.php
index 8049b45fb..8049b45fb 100755..100644
--- a/mod/apps.php
+++ b/mod/apps.php
diff --git a/mod/attach.php b/mod/attach.php
index ae6540201..ae6540201 100755..100644
--- a/mod/attach.php
+++ b/mod/attach.php
diff --git a/mod/cb.php b/mod/cb.php
index 6375d2398..6375d2398 100755..100644
--- a/mod/cb.php
+++ b/mod/cb.php
diff --git a/mod/common.php b/mod/common.php
index 852388c14..852388c14 100755..100644
--- a/mod/common.php
+++ b/mod/common.php
diff --git a/mod/community.php b/mod/community.php
index f8cc3305b..f8cc3305b 100755..100644
--- a/mod/community.php
+++ b/mod/community.php
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index bf81afe07..bf81afe07 100755..100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
diff --git a/mod/contacts.php b/mod/contacts.php
index 8aa51d00a..8aa51d00a 100755..100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
diff --git a/mod/crepair.php b/mod/crepair.php
index ec963b105..ec963b105 100755..100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 65d39d5fe..65d39d5fe 100755..100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 5c2788983..5c2788983 100755..100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 5881b7b51..5881b7b51 100755..100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
diff --git a/mod/directory.php b/mod/directory.php
index 7f18bd026..7f18bd026 100755..100644
--- a/mod/directory.php
+++ b/mod/directory.php
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 34c54dd91..34c54dd91 100755..100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
diff --git a/mod/display.php b/mod/display.php
index 81ed174ac..81ed174ac 100755..100644
--- a/mod/display.php
+++ b/mod/display.php
diff --git a/mod/editpost.php b/mod/editpost.php
index 4c00201ca..4c00201ca 100755..100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
diff --git a/mod/events.php b/mod/events.php
index e66a2dc44..e66a2dc44 100755..100644
--- a/mod/events.php
+++ b/mod/events.php
diff --git a/mod/filer.php b/mod/filer.php
index c0cca9e6d..c0cca9e6d 100755..100644
--- a/mod/filer.php
+++ b/mod/filer.php
diff --git a/mod/follow.php b/mod/follow.php
index ae8cb200c..ae8cb200c 100755..100644
--- a/mod/follow.php
+++ b/mod/follow.php
diff --git a/mod/friendica.php b/mod/friendica.php
index 52a064224..52a064224 100755..100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
diff --git a/mod/friendika.php b/mod/friendika.php
index 1f3df565d..1f3df565d 100755..100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 9ef8f4c55..9ef8f4c55 100755..100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
diff --git a/mod/group.php b/mod/group.php
index a282dbccf..a282dbccf 100755..100644
--- a/mod/group.php
+++ b/mod/group.php
diff --git a/mod/hcard.php b/mod/hcard.php
index 6d2d9e2eb..6d2d9e2eb 100755..100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
diff --git a/mod/help.php b/mod/help.php
index af05bd47c..af05bd47c 100755..100644
--- a/mod/help.php
+++ b/mod/help.php
diff --git a/mod/home.php b/mod/home.php
index 0320c1b39..0320c1b39 100755..100644
--- a/mod/home.php
+++ b/mod/home.php
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index fe61a874c..fe61a874c 100755..100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
diff --git a/mod/install.php b/mod/install.php
index d1142248a..d1142248a 100755..100644
--- a/mod/install.php
+++ b/mod/install.php
diff --git a/mod/invite.php b/mod/invite.php
index 2dbf93c59..2dbf93c59 100755..100644
--- a/mod/invite.php
+++ b/mod/invite.php
diff --git a/mod/item.php b/mod/item.php
index 72e63865b..72e63865b 100755..100644
--- a/mod/item.php
+++ b/mod/item.php
diff --git a/mod/like.php b/mod/like.php
index 6b97fafb5..6b97fafb5 100755..100644
--- a/mod/like.php
+++ b/mod/like.php
diff --git a/mod/localtime.php b/mod/localtime.php
index c03eae1b0..c03eae1b0 100755..100644
--- a/mod/localtime.php
+++ b/mod/localtime.php
diff --git a/mod/lockview.php b/mod/lockview.php
index 9e64e2608..9e64e2608 100755..100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
diff --git a/mod/login.php b/mod/login.php
index 10b4d3001..10b4d3001 100755..100644
--- a/mod/login.php
+++ b/mod/login.php
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 57e6d6965..57e6d6965 100755..100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
diff --git a/mod/manage.php b/mod/manage.php
index 84dfa6917..84dfa6917 100755..100644
--- a/mod/manage.php
+++ b/mod/manage.php
diff --git a/mod/match.php b/mod/match.php
index 926df1dff..926df1dff 100755..100644
--- a/mod/match.php
+++ b/mod/match.php
diff --git a/mod/message.php b/mod/message.php
index 1369fde2e..1369fde2e 100755..100644
--- a/mod/message.php
+++ b/mod/message.php
diff --git a/mod/modexp.php b/mod/modexp.php
index bba2c2882..bba2c2882 100755..100644
--- a/mod/modexp.php
+++ b/mod/modexp.php
diff --git a/mod/msearch.php b/mod/msearch.php
index 94def7d89..94def7d89 100755..100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
diff --git a/mod/network.php b/mod/network.php
index d27945a86..b12bd16da 100755..100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -206,8 +206,12 @@ function network_content(&$a, $update = 0) {
 
 
 	);
-	$tpl = get_markup_template('common_tabs.tpl');
-	$o .= replace_macros($tpl, array('$tabs'=>$tabs));
+
+	$arr = array('tabs' => $tabs);
+	call_hooks('network_tabs', $arr);
+
+	$o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs']));
+
 	// --- end item filter tabs
 
 
diff --git a/mod/newmember.php b/mod/newmember.php
index 683463ecb..683463ecb 100755..100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
diff --git a/mod/notes.php b/mod/notes.php
index e6e2b44fb..e6e2b44fb 100755..100644
--- a/mod/notes.php
+++ b/mod/notes.php
diff --git a/mod/notice.php b/mod/notice.php
index 19cf53189..19cf53189 100755..100644
--- a/mod/notice.php
+++ b/mod/notice.php
diff --git a/mod/notifications.php b/mod/notifications.php
index 690a99562..690a99562 100755..100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
diff --git a/mod/oembed.php b/mod/oembed.php
index 236625f68..236625f68 100755..100644
--- a/mod/oembed.php
+++ b/mod/oembed.php
diff --git a/mod/oexchange.php b/mod/oexchange.php
index bbb436e70..bbb436e70 100755..100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
diff --git a/mod/openid.php b/mod/openid.php
index e2cea7d85..e2cea7d85 100755..100644
--- a/mod/openid.php
+++ b/mod/openid.php
diff --git a/mod/opensearch.php b/mod/opensearch.php
index ff748d1c5..ff748d1c5 100755..100644
--- a/mod/opensearch.php
+++ b/mod/opensearch.php
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 27dac4d5d..27dac4d5d 100755..100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
diff --git a/mod/photo.php b/mod/photo.php
index 3a7025120..3a7025120 100755..100644
--- a/mod/photo.php
+++ b/mod/photo.php
diff --git a/mod/photos.php b/mod/photos.php
index 2a808cb41..2a808cb41 100755..100644
--- a/mod/photos.php
+++ b/mod/photos.php
diff --git a/mod/poco.php b/mod/poco.php
index acfa3ffaa..acfa3ffaa 100755..100644
--- a/mod/poco.php
+++ b/mod/poco.php
diff --git a/mod/post.php b/mod/post.php
index 4a7e33b23..4a7e33b23 100755..100644
--- a/mod/post.php
+++ b/mod/post.php
diff --git a/mod/probe.php b/mod/probe.php
index c95db291b..c95db291b 100755..100644
--- a/mod/probe.php
+++ b/mod/probe.php
diff --git a/mod/profile.php b/mod/profile.php
index 68d73fba3..68d73fba3 100755..100644
--- a/mod/profile.php
+++ b/mod/profile.php
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ace8dadd4..ace8dadd4 100755..100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
diff --git a/mod/profiles.php b/mod/profiles.php
index 7b3b6ccc1..7b3b6ccc1 100755..100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
diff --git a/mod/profperm.php b/mod/profperm.php
index 8d09c429c..8d09c429c 100755..100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 93d50ef90..93d50ef90 100755..100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
diff --git a/mod/qsearch.php b/mod/qsearch.php
index c35e253b6..c35e253b6 100755..100644
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
diff --git a/mod/receive.php b/mod/receive.php
index 2bd3cc65b..2bd3cc65b 100755..100644
--- a/mod/receive.php
+++ b/mod/receive.php
diff --git a/mod/redir.php b/mod/redir.php
index 9223e5483..9223e5483 100755..100644
--- a/mod/redir.php
+++ b/mod/redir.php
diff --git a/mod/register.php b/mod/register.php
index 630c0a675..630c0a675 100755..100644
--- a/mod/register.php
+++ b/mod/register.php
diff --git a/mod/regmod.php b/mod/regmod.php
index 21f41eb01..21f41eb01 100755..100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
diff --git a/mod/removeme.php b/mod/removeme.php
index ee88bd76a..ee88bd76a 100755..100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
index 5bf4663fd..5bf4663fd 100755..100644
--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
diff --git a/mod/salmon.php b/mod/salmon.php
index 6172d17a1..6172d17a1 100755..100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
diff --git a/mod/search.php b/mod/search.php
index 4ca7db9bb..4ca7db9bb 100755..100644
--- a/mod/search.php
+++ b/mod/search.php
diff --git a/mod/session.php b/mod/session.php
index 22c855edb..22c855edb 100755..100644
--- a/mod/session.php
+++ b/mod/session.php
diff --git a/mod/settings.php b/mod/settings.php
index 6879da285..6879da285 100755..100644
--- a/mod/settings.php
+++ b/mod/settings.php
diff --git a/mod/share.php b/mod/share.php
index 6c6098c83..6c6098c83 100755..100644
--- a/mod/share.php
+++ b/mod/share.php
diff --git a/mod/smilies.php b/mod/smilies.php
index c47f95da7..c47f95da7 100755..100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
diff --git a/mod/starred.php b/mod/starred.php
index 035b81e76..035b81e76 100755..100644
--- a/mod/starred.php
+++ b/mod/starred.php
diff --git a/mod/suggest.php b/mod/suggest.php
index 7a86d53a1..7a86d53a1 100755..100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
diff --git a/mod/tagger.php b/mod/tagger.php
index 3ff5d57aa..3ff5d57aa 100755..100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
diff --git a/mod/tagrm.php b/mod/tagrm.php
index 5041145cc..5041145cc 100755..100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
diff --git a/mod/uexport.php b/mod/uexport.php
index e1fb22855..e1fb22855 100755..100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
diff --git a/mod/update_community.php b/mod/update_community.php
index 3dcbce6b1..3dcbce6b1 100755..100644
--- a/mod/update_community.php
+++ b/mod/update_community.php
diff --git a/mod/update_network.php b/mod/update_network.php
index 36de0722a..36de0722a 100755..100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
diff --git a/mod/update_notes.php b/mod/update_notes.php
index 90cc5bc69..90cc5bc69 100755..100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
diff --git a/mod/update_profile.php b/mod/update_profile.php
index c4884b30f..c4884b30f 100755..100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index e7d26b73e..e7d26b73e 100755..100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 3fa4eaed5..3fa4eaed5 100755..100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index ecf475291..ecf475291 100755..100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 64f174a78..64f174a78 100755..100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 74bd2c954..74bd2c954 100755..100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
diff --git a/mod/xrd.php b/mod/xrd.php
index 2fa6bcd99..2fa6bcd99 100755..100644
--- a/mod/xrd.php
+++ b/mod/xrd.php