Skip to content

Commit

Permalink
wrap
Browse files Browse the repository at this point in the history
  • Loading branch information
mrubinsk committed Feb 11, 2016
1 parent 1a0dbce commit c2c20e2
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions turba/lib/Driver/Vbook.php
Expand Up @@ -48,7 +48,9 @@ public function __construct($name = '', array $params = array())
$this->_share = $this->_params['share'];

/* Load the underlying driver. */
$this->_driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($this->_params['source']);
$this->_driver = $GLOBALS['injector']
->getInstance('Turba_Factory_Driver')
->create($this->_params['source']);

$this->searchCriteria = empty($this->_params['criteria'])
? array()
Expand Down Expand Up @@ -80,7 +82,8 @@ protected function _getContactOwner()
* @return array Hash containing the search results.
* @throws Turba_Exception
*/
protected function _search(array $criteria, array $fields, array $blobFields = array(), $count_only = false)
protected function _search(
array $criteria, array $fields, array $blobFields = array(), $count_only = false)
{
/* Add the passed in search criteria to the vbook criteria
* (which need to be mapped from turba fields to
Expand Down Expand Up @@ -114,7 +117,10 @@ protected function _filterTags($objects, $tags)
// Overridden in this class so we can grab the internally stored
// tag criteria.
if (isset($this->searchCriteria['tags'])) {
$tags = array_merge($injector->getInstance('Turba_Tagger')->split($this->searchCriteria['tags']), $tags);
$tags = array_merge(
$injector->getInstance('Turba_Tagger')->split($this->searchCriteria['tags']),
$tags
);

}

Expand Down

0 comments on commit c2c20e2

Please sign in to comment.