diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-25 06:17:39 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-25 06:17:39 -0400 |
| commit | f027bf81cdaddee5d6474199c1b7adce50e6e07d (patch) | |
| tree | 23fd281c6627b7adc1421fcddf939e6447a4d18b /Zotlabs | |
| parent | f3eae7132f8c104db2197858208f16a5792507be (diff) | |
| parent | a9d926886e6f8ed389031791799ffd352b8cb651 (diff) | |
| download | volse-hubzilla-f027bf81cdaddee5d6474199c1b7adce50e6e07d.tar.gz volse-hubzilla-f027bf81cdaddee5d6474199c1b7adce50e6e07d.tar.bz2 volse-hubzilla-f027bf81cdaddee5d6474199c1b7adce50e6e07d.zip | |
Merge remote-tracking branch 'upstream/dev' into help-content
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Extend/Hook.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Module/Photos.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Profiles.php | 1 |
4 files changed, 15 insertions, 2 deletions
diff --git a/Zotlabs/Extend/Hook.php b/Zotlabs/Extend/Hook.php index 836b29db8..edfacfa3b 100644 --- a/Zotlabs/Extend/Hook.php +++ b/Zotlabs/Extend/Hook.php @@ -6,6 +6,10 @@ namespace Zotlabs\Extend; class Hook { static public function register($hook,$file,$function,$version = 1,$priority = 0) { + if(is_array($function)) { + $function = serialize($function); + } + $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' and priority = %d and hook_version = %d LIMIT 1", dbesc($hook), dbesc($file), @@ -28,6 +32,9 @@ class Hook { } static public function unregister($hook,$file,$function,$version = 1,$priority = 0) { + if(is_array($function)) { + $function = serialize($function); + } $r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s' and priority = %d and hook_version = %d", dbesc($hook), dbesc($file), @@ -63,6 +70,9 @@ class Hook { */ static public function insert($hook, $fn, $version = 0, $priority = 0) { + if(is_array($fn)) { + $fn = serialize($fn); + } if(! is_array(App::$hooks)) App::$hooks = array(); diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 2b524096f..a1268510d 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -514,7 +514,7 @@ class Connedit extends \Zotlabs\Web\Controller { $contact_id = \App::$poi['abook_id']; $contact = \App::$poi; - $buttons = array( + $tools = array( 'view' => array( 'label' => t('View Profile'), @@ -711,7 +711,8 @@ class Connedit extends \Zotlabs\Web\Controller { '$notself' => (($self) ? '' : '1'), '$self' => (($self) ? '1' : ''), '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), - '$buttons' => (($self) ? '' : $buttons), + '$tools_label' => t('Connection Tools'), + '$tools' => (($self) ? '' : $tools), '$lbl_slider' => t('Slide to adjust your degree of friendship'), '$lbl_rating' => t('Rating'), '$lbl_rating_label' => t('Slide to adjust your rating'), diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 00a577847..ce350666f 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1231,6 +1231,7 @@ class Photos extends \Zotlabs\Web\Controller { $o .= replace_macros($photo_tpl, array( '$id' => $ph[0]['id'], '$album' => $album_e, + '$tools_label' => t('Photo Tools'), '$tools' => $tools, '$lock' => $lockstate[1], '$photo' => $photo, diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 30ec337f8..72edf396f 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -691,6 +691,7 @@ class Profiles extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$viewprof' => t('View this profile'), '$editvis' => t('Edit visibility'), + '$tools_label' => t('Profile Tools'), '$coverpic' => t('Change cover photo'), '$profpic' => t('Change profile photo'), '$cr_prof' => t('Create a new profile using these settings'), |