aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-15 17:32:48 -0700
committerfriendica <info@friendica.com>2014-09-15 17:32:48 -0700
commite25a273100fe3127ec554085fa5128049a06214f (patch)
tree992c1631a3dc74efe5a76452ee61316181b2bc17
parentbbc9e4427e76761b0607ce2c1a1f5cc7f499b52f (diff)
parentd2a4b34c98534940c12a2a5f093c7a2f7485b93c (diff)
downloadvolse-hubzilla-e25a273100fe3127ec554085fa5128049a06214f.tar.gz
volse-hubzilla-e25a273100fe3127ec554085fa5128049a06214f.tar.bz2
volse-hubzilla-e25a273100fe3127ec554085fa5128049a06214f.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--doc/intro_for_developers.bb2
-rw-r--r--view/theme/redbasic/php/style.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb
index 2f498e6fb..4fb8ed3a9 100644
--- a/doc/intro_for_developers.bb
+++ b/doc/intro_for_developers.bb
@@ -52,7 +52,7 @@
[li]chatroom - data for the actual chat room[/li]
[li]clients - OAuth usage[/li]
[li]config - main configuration storage[/li]
- [li]conv - [/li]
+ [li]conv - Diaspora private messages[/li]
[li]event - Events[/li]
[li]fcontact - friend suggestion stuff[/li]
[li]ffinder - friend suggestion stuff[/li]
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index dbe7c306d..cd91fcee7 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -64,7 +64,7 @@ if(! $a->install) {
// should leave it for admins to define for themselves.
if (! $schema) {
if(file_exists('view/theme/redbasic/schema/default.php')) {
- $schemefile = 'view/theme/redbasic/schema/' . 'default.php';
+ $schemefile = 'view/theme/redbasic/schema/default.php';
require_once ($schemefile);
}
}