diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-29 19:52:00 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-29 19:52:00 -0700 |
| commit | ceed0f7a1b6d7ee713c23937a9449bd84324caf6 (patch) | |
| tree | 5965dcc382e48b1918abb77bcfd2626ac63c2470 /Zotlabs | |
| parent | 906d91d4d11242b55d48cf7dd4235bd2c9773aa4 (diff) | |
| download | volse-hubzilla-ceed0f7a1b6d7ee713c23937a9449bd84324caf6.tar.gz volse-hubzilla-ceed0f7a1b6d7ee713c23937a9449bd84324caf6.tar.bz2 volse-hubzilla-ceed0f7a1b6d7ee713c23937a9449bd84324caf6.zip | |
allow plugin class widgets, fix sql error in page module
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Page.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php index d794a43a1..5fdd32825 100644 --- a/Zotlabs/Module/Page.php +++ b/Zotlabs/Module/Page.php @@ -100,7 +100,7 @@ class Page extends \Zotlabs\Web\Controller { $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 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']), dbesc($page_id), intval(ITEM_TYPE_WEBPAGE) diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index 8831bd117..78ca870a7 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -469,8 +469,11 @@ class Comanche { if(file_exists('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')) require_once('Zotlabs/Widget/' . $clsname . '.php'); + if(class_exists($nsname)) { $x = new $nsname; $f = 'widget'; |