diff options
| -rw-r--r-- | Zotlabs/Module/Page.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 3 | ||||
| -rwxr-xr-x | util/add_widget_repo | 11 |
3 files changed, 4 insertions, 12 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'; diff --git a/util/add_widget_repo b/util/add_widget_repo index cb3112626..4cfd6a170 100755 --- a/util/add_widget_repo +++ b/util/add_widget_repo @@ -5,17 +5,6 @@ if [ $# -lt 2 ]; then exit 1 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 widget > /dev/null 2>&1 git clone $1 extend/widget/$2 |