Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc actions/shownotice.php
Simple merge

diff --cc classes/File.php
Simple merge

diff --cc index.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/apiaction.php
index f1304a1d1e4f40d7f28db1c480de4706628504df,062e6d07746fcf2cfa34b72cfac95f372b8d5575..062e6d07746fcf2cfa34b72cfac95f372b8d5575
mode 100644,100755..100644
--- 1/lib/apiaction.php
--- 2/lib/apiaction.php
+++ b/lib/apiaction.php

diff --cc lib/attachmentlistitem.php
Simple merge

diff --cc lib/docfile.php
Simple merge

diff --cc lib/framework.php
index 283453f8eb2ed3251f3a2af63efd153df3178236,b71f365c244cd0e3320142c87be199dc219f1550..6fe6028f6e229699a1cfbf1152b51a1cf3ccf1ac
--- 1/lib/framework.php
--- 2/lib/framework.php
+++ b/lib/framework.php
@@@ -102,31 -102,9 +102,31 @@@ function addPlugin($name, array $attrs=
  
  function _have_config()
  {
-     return StatusNet::haveConfig();
+     return GNUsocial::haveConfig();
  }
  
 +function common_get_temp_dir()
 +{
 +    // Try to get it from php.ini first
 +    $temp_path = trim(ini_get('upload_tmp_dir'));
 +
 +    // Is it empty?
 +    if (strlen($temp_path) == 0) {
 +        // Then try sys_get_temp_dir()
 +        $temp_path = trim(sys_get_temp_dir());
 +
 +        // Still empty?
 +        if (strlen($temp_path) == 0) {
 +            // Then set it to /tmp (ugly)
 +            // @TODO Hard-coded non-Windows stuff!
 +            $temp_path = '/tmp';
 +        }
 +    }
 +
 +    // Return found path
 +    return $temp_path;
 +}
 +
  function GNUsocial_class_autoload($cls)
  {
      if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {

diff --cc lib/installer.php
Simple merge

diff --cc lib/plugin.php
Simple merge

diff --cc lib/rssaction.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/Autocomplete/actions/autocomplete.php
Simple merge

diff --cc plugins/Bookmark/actions/newbookmark.php
Simple merge

diff --cc plugins/Cronish/CronishPlugin.php
Simple merge

diff --cc plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
Simple merge

diff --cc plugins/DomainStatusNetwork/actions/globalapi.php
index faf38378ecbb73f00bf968f67daac65e214410e2,d47a254940e45dcc099c8004f810bb599706b2d1..b283ce8da6460cba97e48774f843b62c87860ffb
--- 1/plugins/DomainStatusNetwork/actions/globalapi.php
--- 2/plugins/DomainStatusNetwork/actions/globalapi.php
+++ b/plugins/DomainStatusNetwork/actions/globalapi.php
@@@ -57,9 -57,9 +57,9 @@@ class GlobalApiAction extends Actio
       * @return boolean continuation flag
       */
  
 -    function prepare($args)
 +    function prepare(array $args=array())
      {
-         StatusNet::setApi(true); // reduce exception reports to aid in debugging
+         GNUsocial::setApi(true); // reduce exception reports to aid in debugging
  
          parent::prepare($args);
  

diff --cc plugins/EmailReminder/scripts/sendemailreminder.php
Simple merge

diff --cc plugins/EmailSummary/scripts/sendemailsummary.php
Simple merge

diff --cc plugins/Event/actions/cancelrsvp.php
Simple merge

diff --cc plugins/Event/actions/newrsvp.php
Simple merge

diff --cc plugins/LinkPreview/actions/oembedproxy.php
index 095cfe03d7cbe765b891f97433e9576756f022c7,97b0942441e94a8a93bcb9663ae13c26294fed51..c0473fb597633a75929b96edc397e7153ed2039f
--- 1/plugins/LinkPreview/actions/oembedproxy.php
--- 2/plugins/LinkPreview/actions/oembedproxy.php
+++ b/plugins/LinkPreview/actions/oembedproxy.php
@@@ -46,10 -46,10 +46,10 @@@ if (!defined('STATUSNET') && !defined('
   */
  class OembedproxyAction extends OembedAction
  {
 -    function handle($args)
 +    function handle(array $args=array())
      {
          // Trigger short error responses; not a human-readable web page.
-         StatusNet::setApi(true);
+         GNUsocial::setApi(true);
  
          // We're not a general oEmbed proxy service; limit to valid sessions.
          $token = $this->trimmed('token');

diff --cc plugins/Mapstraction/MapstractionPlugin.php
Simple merge

diff --cc plugins/OStatus/lib/salmonaction.php
Simple merge

diff --cc plugins/OpportunisticQM/OpportunisticQMPlugin.php
Simple merge

diff --cc plugins/Poll/actions/newpoll.php
Simple merge

diff --cc plugins/Poll/actions/respondpoll.php
Simple merge

diff --cc plugins/QnA/actions/qnaclosequestion.php
Simple merge

diff --cc plugins/QnA/actions/qnanewanswer.php
Simple merge

diff --cc plugins/QnA/actions/qnanewquestion.php
Simple merge

diff --cc plugins/QnA/actions/qnareviseanswer.php
Simple merge

diff --cc plugins/QnA/actions/qnavote.php
Simple merge

diff --cc plugins/Realtime/scripts/cleanupchannels.php
Simple merge

diff --cc plugins/Recaptcha/RecaptchaPlugin.php
Simple merge

diff --cc plugins/SearchSub/actions/searchsub.php
Simple merge

diff --cc plugins/TagSub/actions/tagsub.php
Simple merge