strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source
This commit is contained in:
Thomas Willingham 2012-11-19 16:03:54 +00:00
parent 7139e60b94 f1c579e74a
commit ded2aea16a
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boot.php
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1527' ); define ( 'FRIENDICA_VERSION', '3.0.1531' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 ); define ( 'DB_UPDATE_VERSION', 1156 );
@ -437,8 +437,9 @@ if(! class_exists('App')) {
if(isset($path) && strlen($path) && ($path != $this->path)) if(isset($path) && strlen($path) && ($path != $this->path))
$this->path = $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) ); $this->set_baseurl(array_pop($argv) );
$argc --;
} }
set_include_path( set_include_path(

1
include/directory.php
View file

@ -38,6 +38,7 @@ function directory_run(&$argv, &$argc){
call_hooks('globaldir_update', $arr); call_hooks('globaldir_update', $arr);
logger('Updating directory: ' . $arr['url'], LOGGER_DEBUG);
if(strlen($arr['url'])) if(strlen($arr['url']))
fetch_url($dir . '?url=' . bin2hex($arr['url'])); fetch_url($dir . '?url=' . bin2hex($arr['url']));

6
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1527\n" "Project-Id-Version: 3.0.1531\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -8779,7 +8779,7 @@ msgstr ""
msgid "Cannot locate DNS info for database server '%s'" msgid "Cannot locate DNS info for database server '%s'"
msgstr "" msgstr ""
#: ../../include/message.php:15 ../../include/message.php:171 #: ../../include/message.php:15 ../../include/message.php:172
msgid "[no subject]" msgid "[no subject]"
msgstr "" msgstr ""