harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-09-15 17:32:48 -07:00
commit e25a273100
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/intro_for_developers.bb
View File

@ -52,7 +52,7 @@
[li]chatroom - data for the actual chat room[/li] [li]chatroom - data for the actual chat room[/li]
[li]clients - OAuth usage[/li] [li]clients - OAuth usage[/li]
[li]config - main configuration storage[/li] [li]config - main configuration storage[/li]
[li]conv - [/li] [li]conv - Diaspora private messages[/li]
[li]event - Events[/li] [li]event - Events[/li]
[li]fcontact - friend suggestion stuff[/li] [li]fcontact - friend suggestion stuff[/li]
[li]ffinder - friend suggestion stuff[/li] [li]ffinder - friend suggestion stuff[/li]

2
view/theme/redbasic/php/style.php
View File

@ -64,7 +64,7 @@ if(! $a->install) {
// should leave it for admins to define for themselves. // should leave it for admins to define for themselves.
if (! $schema) { if (! $schema) {
if(file_exists('view/theme/redbasic/schema/default.php')) { 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); require_once ($schemefile);
} }
} }