Merge https://github.com/friendica/friendica into pull

diff --git a/boot.php b/boot.php
index f69f6fe820d62a942283487e8ef47c1ce8a6f923..05711e3a256d58c9bd1c1c0a46cc58bcf2004f11 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1527' );
+define ( 'FRIENDICA_VERSION',      '3.0.1531' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 
@@ -437,8 +437,9 @@ if(! class_exists('App')) {
                                if(isset($path) && strlen($path) && ($path != $this->path))
                                        $this->path = $path;
                        }
-                       if (is_array($argv) && $argc>1 && !x($_SERVER,'SERVER_NAME') && substr(end($argv), 0, 4)=="http" ) {
+                       if (is_array($argv) && $argc>1 && substr(end($argv), 0, 4)=="http" ) {
                                $this->set_baseurl(array_pop($argv) );
+                               $argc --;
                        }
 
                        set_include_path(

diff --git a/include/directory.php b/include/directory.php
index 356118bb08d5ca1dbef2ec824399275732768de2..29a793a2a01ecba93efe2a11ac7b6adea3d1d7ff 100644 (file)
--- a/include/directory.php
+++ b/include/directory.php
@@ -38,6 +38,7 @@ function directory_run(&$argv, &$argc){
 
        call_hooks('globaldir_update', $arr);
 
+       logger('Updating directory: ' . $arr['url'], LOGGER_DEBUG);
        if(strlen($arr['url']))
                fetch_url($dir . '?url=' . bin2hex($arr['url']));
 

diff --git a/util/messages.po b/util/messages.po
index 59f7a3975f04897634a61d4a861c23942e3538a2..9080aa06e5a7a6e1ffa3a7ae4344820546eaa501 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1527\n"
+"Project-Id-Version: 3.0.1531\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-14 10:00-0800\n"
+"POT-Creation-Date: 2012-11-18 10:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8779,7 +8779,7 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/message.php:15 ../../include/message.php:171
+#: ../../include/message.php:15 ../../include/message.php:172
 msgid "[no subject]"
 msgstr ""