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

allow plugin class widgets, fix sql error in page module

Browse Source
This commit is contained in:
zotlabs 2017-10-29 19:52:00 -07:00
parent 906d91d4d1
commit ceed0f7a1b
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Page.php
View File

@ -100,7 +100,7 @@ class Page extends \Zotlabs\Web\Controller {
$r = q("select item.* from item left join iconfig on item.id = iconfig.iid $r = q("select item.* from item left join iconfig on item.id = iconfig.iid
where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0
and iconfig.k = 'WEBPAGE' and item_type = %d and iconfig.k = 'WEBPAGE' and item_type = %d
OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1", $sql_options $revision limit 1",
intval($u[0]['channel_id']), intval($u[0]['channel_id']),
dbesc($page_id), dbesc($page_id),
intval(ITEM_TYPE_WEBPAGE) intval(ITEM_TYPE_WEBPAGE)

3
Zotlabs/Render/Comanche.php
View File

@ -469,8 +469,11 @@ class Comanche {
if(file_exists('Zotlabs/SiteWidget/' . $clsname . '.php')) if(file_exists('Zotlabs/SiteWidget/' . $clsname . '.php'))
require_once('Zotlabs/SiteWidget/' . $clsname . '.php'); require_once('Zotlabs/SiteWidget/' . $clsname . '.php');
elseif(file_exists('widget/' . $clsname . '/' . $clsname . '.php'))
require_once('widget/' . $clsname . '/' . $clsname . '.php');
elseif(file_exists('Zotlabs/Widget/' . $clsname . '.php')) elseif(file_exists('Zotlabs/Widget/' . $clsname . '.php'))
require_once('Zotlabs/Widget/' . $clsname . '.php'); require_once('Zotlabs/Widget/' . $clsname . '.php');
if(class_exists($nsname)) { if(class_exists($nsname)) {
$x = new $nsname; $x = new $nsname;
$f = 'widget'; $f = 'widget';

11
util/add_widget_repo
View File

@ -5,17 +5,6 @@ if [ $# -lt 2 ]; then
exit 1 exit 1
fi fi
#if [[ $1 != *"//github.com/redmatrix"* && $3 != 'insecure' ]]; then
# echo "";
# echo "This is NOT an official project repository.";
# echo "In order to protect you from unverified and";
# echo "possibly malicious content, this repository";
# echo "will not be linked to your site unless you";
# echo "append the word 'insecure' to the command.";
# echo "";
# exit 1
#fi
mkdir -p extend/widget/$2 mkdir -p extend/widget/$2
mkdir widget > /dev/null 2>&1 mkdir widget > /dev/null 2>&1
git clone $1 extend/widget/$2 git clone $1 extend/widget/$2