fix include paths when started via cmdline

diff --git a/boot.php b/boot.php
index 6819abd3b01697aa71c38f02354c4a3264340a24..71de66e68cf1fd15ae49bb09b6b7709d522930f6 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1704' );
+define ( 'FRIENDICA_VERSION',      '3.1.1706' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
@@ -437,6 +437,14 @@ if(! class_exists('App')) {
 
                        startup();
 
+                       set_include_path(
+                                       'include' . PATH_SEPARATOR
+                                       . 'library' . PATH_SEPARATOR
+                                       . 'library/phpsec' . PATH_SEPARATOR
+                                       . 'library/langdet' . PATH_SEPARATOR
+                                       . '.' );
+
+
                        $this->scheme = 'http';
                        if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
                                $this->scheme = 'https';
@@ -471,15 +479,8 @@ if(! class_exists('App')) {
                                $argc --;
                        }
 
-                       set_include_path(
-                                       "include/$this->hostname" . PATH_SEPARATOR
-                                       . 'include' . PATH_SEPARATOR
-                                       . 'library' . PATH_SEPARATOR
-                                       . 'library/phpsec' . PATH_SEPARATOR
-                                       . 'library/langdet' . PATH_SEPARATOR
-                                       . '.' );
+                       set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
             
-
                        if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
                                $this->query_string = substr($_SERVER['QUERY_STRING'],2);
                                // removing trailing / - maybe a nginx problem

diff --git a/include/pgettext.php b/include/pgettext.php
index 93dd3e4b6df1db43206ca3dd51d7fa16a8ca2363..0c003a7500c78acc7b1e3b670b62dd559ef2ecca 100644 (file)
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once("dba.php");
+require_once("include/dba.php");
 
 /**
  * translation support

diff --git a/util/messages.po b/util/messages.po
index 88a0d62585bf027593d53d867fcd62868ba4fec7..cfa2cfe6db62b993e4e20b0d0ec540158b8d241b 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1704\n"
+"Project-Id-Version: 3.1.1706\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-18 00:02-0700\n"
+"POT-Creation-Date: 2013-05-20 00:03-0700\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"