diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-20 22:13:20 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-20 22:13:20 -0700 |
| commit | 019250eff879d86577157ad6136a3613b61cacb8 (patch) | |
| tree | c22d2eda2cee6b836a331104db588d9396626891 /Zotlabs/Module | |
| parent | ac095c89f1ef8cf2207c3db94b10c6e4a3d8f5a7 (diff) | |
| download | volse-hubzilla-019250eff879d86577157ad6136a3613b61cacb8.tar.gz volse-hubzilla-019250eff879d86577157ad6136a3613b61cacb8.tar.bz2 volse-hubzilla-019250eff879d86577157ad6136a3613b61cacb8.zip | |
consolidate include/*_selectors.php (not touching acl_selectors for the moment, as it will likely end up with a different disposition)
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Connections.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Profiles.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Thing.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Viewconnections.php | 3 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index 564f4e527..ebf8ff8e6 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -3,7 +3,7 @@ namespace Zotlabs\Module; require_once('include/Contact.php'); require_once('include/socgraph.php'); -require_once('include/contact_selectors.php'); +require_once('include/selectors.php'); require_once('include/group.php'); require_once('include/contact_widgets.php'); require_once('include/zot.php'); diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 0820c76bf..8bf4ac9b4 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -9,7 +9,7 @@ namespace Zotlabs\Module; require_once('include/Contact.php'); require_once('include/socgraph.php'); -require_once('include/contact_selectors.php'); +require_once('include/selectors.php'); require_once('include/group.php'); require_once('include/contact_widgets.php'); require_once('include/zot.php'); @@ -583,8 +583,6 @@ class Connedit extends \Zotlabs\Web\Controller { if(intval($contact['abook_self'])) $self = true; - require_once('include/contact_selectors.php'); - $tpl = get_markup_template("abook_edit.tpl"); if(feature_enabled(local_channel(),'affinity')) { diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 3db089e53..e738d0c96 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -2,6 +2,7 @@ namespace Zotlabs\Module; require_once('include/identity.php'); +require_once('include/selectors.php'); class Profiles extends \Zotlabs\Web\Controller { @@ -625,7 +626,7 @@ class Profiles extends \Zotlabs\Web\Controller { return; } - require_once('include/profile_selectors.php'); + require_once('include/selectors.php'); $editselect = 'none'; diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php index e95ec53f6..6fc5219d8 100644 --- a/Zotlabs/Module/Thing.php +++ b/Zotlabs/Module/Thing.php @@ -7,7 +7,7 @@ namespace Zotlabs\Module; require_once('include/items.php'); require_once('include/security.php'); -require_once('include/contact_selectors.php'); +require_once('include/selectors.php'); require_once('include/acl_selectors.php'); diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php index 726ef043b..a9445cdeb 100644 --- a/Zotlabs/Module/Viewconnections.php +++ b/Zotlabs/Module/Viewconnections.php @@ -1,6 +1,7 @@ <?php namespace Zotlabs\Module; -require_once('include/contact_selectors.php'); + +require_once('include/selectors.php'); require_once('include/Contact.php'); |