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

Merge remote-tracking branch 'upstream/dev' into website-export

Browse Source
This commit is contained in:
Andrew Manning
2016-08-23 06:57:10 -04:00
parent 305e0538d2 1e6a491400
commit 420aa4bc44
28 changed files with 6126 additions and 5926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Acl.php
View File

@@ -72,6 +72,7 @@ class Acl extends \Zotlabs\Web\Controller {
);
$permitted = ids_to_array($x,'xchan');
}
@@ -249,7 +250,7 @@ class Acl extends \Zotlabs\Web\Controller {
);
if($z) {
foreach($z as $zz) {
if(in_array($zz['id'],$permitted)) {
if(in_array($zz['hash'],$permitted)) {
$r[] = $zz;
}
}

1
Zotlabs/Module/Admin.php
View File

@@ -1341,6 +1341,7 @@ class Admin extends \Zotlabs\Web\Controller {
'$str_minversion' => t('Minimum project version: '),
'$str_maxversion' => t('Maximum project version: '),
'$str_minphpversion' => t('Minimum PHP version: '),
'$str_serverroles' => t('Compatible Server Roles: '),
'$str_requires' => t('Requires: '),
'$disabled' => t('Disabled - version incompatibility'),

3
Zotlabs/Module/Channel.php
View File

@@ -140,7 +140,8 @@ class Channel extends \Zotlabs\Web\Controller {
'profile_uid' => \App::$profile['profile_uid'],
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'bbcode' => true,
'jotnets' => true
);
$o .= status_editor($a,$x);

3
Zotlabs/Module/Display.php
View File

@@ -73,7 +73,8 @@ class Display extends \Zotlabs\Web\Controller {
'expanded' => true,
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'bbcode' => true,
'jotnets' => true
);
$o = '<div id="jot-popup">';

5
Zotlabs/Module/Network.php
View File

@@ -159,7 +159,7 @@ class Network extends \Zotlabs\Web\Controller {
'allow_gid' => $channel['channel_allow_gid'],
'deny_cid' => $channel['channel_deny_cid'],
'deny_gid' => $channel['channel_deny_gid']
);
);
$private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false);
@@ -176,7 +176,8 @@ class Network extends \Zotlabs\Web\Controller {
'profile_uid' => local_channel(),
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'bbcode' => true,
'jotnets' => true
);
if($deftag)
$x['pretext'] = $deftag;

5
Zotlabs/Module/Rpost.php
View File

@@ -126,7 +126,10 @@ class Rpost extends \Zotlabs\Web\Controller {
'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''),
'return_path' => 'rpost/return',
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'editor_autocomplete'=> true,
'bbcode' => true,
'jotnets' => true
);
$editor = status_editor($a,$x);

2
Zotlabs/Module/Setup.php
View File

@@ -101,7 +101,7 @@ class Setup extends \Zotlabs\Web\Controller {
$timezone = notags(trim($_POST['timezone']));
$adminmail = notags(trim($_POST['adminmail']));
$siteurl = notags(trim($_POST['siteurl']));
$advanced = ((intval($_POST['advanced'])) ? 'pro' : 'basic');
$advanced = ((intval($_POST['advanced'])) ? 'standard' : 'basic');
if($siteurl != z_root()) {
$test = z_fetch_url($siteurl."/setup/testrewrite");