6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.1.0_beta1 | 2009-08-21

Browse Source
This commit is contained in:
6543
2019-07-17 22:16:19 +02:00
parent 2c1152f0d3
commit 8dee6b1a10
2306 changed files with 251360 additions and 23428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/Zend/Service/Yahoo.php
View File

@ -18,7 +18,7 @@
* @subpackage Yahoo
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Yahoo.php 8064 2008-02-16 10:58:39Z thomas $
* @version $Id: Yahoo.php 13004 2008-12-03 21:14:45Z matthew $
*/
@ -400,6 +400,7 @@ class Zend_Service_Yahoo
* 'similar_ok' => bool permit similar results in the result set
* 'country' => string The country code for the content searched
* 'license' => (any|cc_any|cc_commercial|cc_modifiable) The license of content being searched
* 'region' => The regional search engine on which the service performs the search. default us.
*
* @param string $query the query being run
* @param array $options any optional parameters
@ -803,7 +804,7 @@ class Zend_Service_Yahoo
protected function _validateWebSearch(array $options)
{
$validOptions = array('appid', 'query', 'results', 'start', 'language', 'type', 'format', 'adult_ok',
'similar_ok', 'country', 'site', 'subscription', 'license');
'similar_ok', 'country', 'site', 'subscription', 'license', 'region');
$this->_compareOptions($options, $validOptions);
@ -838,6 +839,12 @@ class Zend_Service_Yahoo
'txt', 'xls'));
$this->_validateInArray('license', $options['license'], array('any', 'cc_any', 'cc_commercial',
'cc_modifiable'));
if (isset($options['region'])){
$this->_validateInArray('region', $options['region'], array('ar', 'au', 'at', 'br', 'ca', 'ct', 'dk', 'fi',
'fr', 'de', 'in', 'id', 'it', 'my', 'mx',
'nl', 'no', 'ph', 'ru', 'sg', 'es', 'se',
'ch', 'th', 'uk', 'us'));
}
}