From 70d0ed9402f67ec31ed5057c28fbab7e230ccd58 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 18 Nov 2012 22:53:01 -0800 Subject: [PATCH 1/2] log directory updates --- boot.php | 2 +- include/directory.php | 1 + util/messages.po | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 8e79d6d9be..a34856ee71 100644 --- 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 ); diff --git a/include/directory.php b/include/directory.php index 356118bb08..29a793a2a0 100644 --- 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 59f7a3975f..9080aa06e5 100644 --- 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 \n" "Language-Team: LANGUAGE \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 "" From 53a908a3d72b4d7ccf2bcf579b721034089f5601 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 18 Nov 2012 23:44:03 -0800 Subject: [PATCH 2/2] fix directory --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index a34856ee71..b00424f950 100644 --- a/boot.php +++ b/boot.php @@ -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(