diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-04-04 20:47:41 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-04-04 20:47:41 +0000 |
| commit | bb9f9a33e4fe83f4d9f8ae88c15b8b1df6d029f2 (patch) | |
| tree | 09fe92feee0843626e67a797c4f0ad2948076251 /includes | |
| parent | f1bb6aec891d7e9f397cead68ff41d934c87d096 (diff) | |
| download | brdo-bb9f9a33e4fe83f4d9f8ae88c15b8b1df6d029f2.tar.gz brdo-bb9f9a33e4fe83f4d9f8ae88c15b8b1df6d029f2.tar.bz2 | |
- Patch #133216 by meba: trying to get property of non-object on line 982.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/locale.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index dd1392973..4c5e49d74 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -937,7 +937,7 @@ function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NUL $plid = 0; } $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key])); - if ($loc->lid) { // a string exists + if (!empty($loc->lid)) { // a string exists $lid = $loc->lid; // update location field db_query("UPDATE {locales_source} SET location = '%s' WHERE lid = %d", $comments, $lid); @@ -974,7 +974,7 @@ function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NUL $english = $value['msgid']; $translation = $value['msgstr']; $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english)); - if ($loc->lid) { // a string exists + if (!empty($loc->lid)) { // a string exists $lid = $loc->lid; // update location field db_query("UPDATE {locales_source} SET location = '%s' WHERE source = '%s'", $comments, $english); @@ -1116,7 +1116,7 @@ function _locale_import_parse_arithmetic($string) { $topop = array_pop($opstk); } } - elseif ($prec[$ctok]) { + elseif (!empty($prec[$ctok])) { // If it's an operator, then pop from $oparr into $elarr until the // precedence in $oparr is less than current, then push into $oparr $topop = array_pop($opstk); |