clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix undefined variables PHP Notice 

- $order_string in include/dba
- $limit_string in include/dba
- $search in mod/search
- $lang_list in include/pgettext.php
This commit is contained in:
Hypolite Petovan 2018-01-19 00:32:37 -05:00
parent ce411da958
commit 4cca8280b4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dba.php
View File

@ -1145,6 +1145,7 @@ class dba {
$condition_string = self::buildCondition($condition); $condition_string = self::buildCondition($condition);
$order_string = '';
if (isset($params['order'])) { if (isset($params['order'])) {
$order_string = " ORDER BY "; $order_string = " ORDER BY ";
foreach ($params['order'] AS $fields => $order) { foreach ($params['order'] AS $fields => $order) {
@ -1157,6 +1158,7 @@ class dba {
$order_string = substr($order_string, 0, -2); $order_string = substr($order_string, 0, -2);
} }
$limit_string = '';
if (isset($params['limit']) && is_int($params['limit'])) { if (isset($params['limit']) && is_int($params['limit'])) {
$limit_string = " LIMIT " . $params['limit']; $limit_string = " LIMIT " . $params['limit'];
} }

5
include/pgettext.php
View File

@ -19,12 +19,12 @@ require_once "include/dba.php";
*/ */
function get_browser_language() { function get_browser_language() {
$lang_list = [];
if (x($_SERVER, 'HTTP_ACCEPT_LANGUAGE')) { if (x($_SERVER, 'HTTP_ACCEPT_LANGUAGE')) {
// break up string into pieces (languages and q factors) // break up string into pieces (languages and q factors)
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse); $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
$lang_list = [];
if (count($lang_parse[1])) { if (count($lang_parse[1])) {
// go through the list of prefered languages and add a generic language // go through the list of prefered languages and add a generic language
// for sub-linguas (e.g. de-ch will add de) if not already in array // for sub-linguas (e.g. de-ch will add de) if not already in array
@ -41,8 +41,7 @@ function get_browser_language() {
} }
// check if we have translations for the preferred languages and pick the 1st that has // check if we have translations for the preferred languages and pick the 1st that has
for ($i = 0; $i < count($lang_list); $i++) { foreach ($lang_list as $lang) {
$lang = $lang_list[$i];
if ($lang === 'en' || (file_exists("view/lang/$lang") && is_dir("view/lang/$lang"))) { if ($lang === 'en' || (file_exists("view/lang/$lang") && is_dir("view/lang/$lang"))) {
$preferred = $lang; $preferred = $lang;
break; break;

1
mod/search.php
View File

@ -135,6 +135,7 @@ function search_content(App $a) {
Nav::setSelected('search'); Nav::setSelected('search');
$search = '';
if (x($a->data,'search')) if (x($a->data,'search'))
$search = notags(trim($a->data['search'])); $search = notags(trim($a->data['search']));
else else