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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2017-09-14 15:02:36 -07:00
commit 6481722fd9
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
boot.php
View File

@ -608,13 +608,15 @@ function sys_boot() {
if(! defined('DEFAULT_PLATFORM_ICON')) {
define( 'DEFAULT_PLATFORM_ICON', '/images/rm-32.png' );
define( 'DEFAULT_PLATFORM_ICON', '/images/hz-32.png' );
}
if(! defined('DEFAULT_NOTIFY_ICON')) {
define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' );
define( 'DEFAULT_NOTIFY_ICON', '/images/hz-white-64.png' );
}
App::head_set_icon(DEFAULT_PLATFORM_ICON);
/*
* Try to open the database;
*/
@ -945,8 +947,6 @@ class App {
self::$is_mobile = $mobile_detect->isMobile();
self::$is_tablet = $mobile_detect->isTablet();
self::head_set_icon(DEFAULT_PLATFORM_ICON);
/*
* register template engines
*/
@ -2448,4 +2448,3 @@ function observer_prohibited($allow_account = false) {
return (((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) ? true : false );
}

2
view/tpl/wiki.tpl
View File

@ -455,8 +455,10 @@
window.editor.on("input", function() {
$('#save-page').removeClass('disabled');
});
{{if $mimeType == 'text/bbcode'}}
window.editor.bbco_autocomplete('bbcode');
{{/if}}
{{/if}}
});
$(window).resize(function () {