aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-08 21:50:41 +0200
committerzottel <github@zottel.net>2012-04-08 21:50:41 +0200
commit315d496290747aab8b3147dc24b822460071bb2d (patch)
tree4d3cd849580d7ba3b8c30667bbb6f0901dc7d738 /boot.php
parentaaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (diff)
parent5c0446975516f2b52b6cf51618e0b75af56de71b (diff)
downloadvolse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.gz
volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.bz2
volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 576cad6b6..b1c378d34 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1304' );
+define ( 'FRIENDICA_VERSION', '2.3.1305' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1137 );
@@ -922,6 +922,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
/**
* load/reload current theme info
*/
+
$theme_info_file = "view/theme/".current_theme()."/theme.php";
if (file_exists($theme_info_file)){
require_once($theme_info_file);