dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5a43da4
)
Avoid notices: Before checking if retval is an array, check if it is defined.
author
Rotem Liss
<rotem@users.mediawiki.org>
Mon, 18 Aug 2008 14:51:10 +0000
(14:51 +0000)
committer
Rotem Liss
<rotem@users.mediawiki.org>
Mon, 18 Aug 2008 14:51:10 +0000
(14:51 +0000)
includes/SiteConfiguration.php
patch
|
blob
|
history
diff --git
a/includes/SiteConfiguration.php
b/includes/SiteConfiguration.php
index
ddaaa58
..
0ed7687
100644
(file)
--- a/
includes/SiteConfiguration.php
+++ b/
includes/SiteConfiguration.php
@@
-46,7
+46,7
@@
class SiteConfiguration {
// Do tag settings
foreach ( $wikiTags as $tag ) {
if ( array_key_exists( $tag, $thisSetting ) ) {
// Do tag settings
foreach ( $wikiTags as $tag ) {
if ( array_key_exists( $tag, $thisSetting ) ) {
- if ( is_array($retval) && is_array($thisSetting[$tag]) ) {
+ if ( is
set($retval) && is
_array($retval) && is_array($thisSetting[$tag]) ) {
$retval = array_merge( $retval, $thisSetting[$tag] );
} else {
$retval = $thisSetting[$tag];
$retval = array_merge( $retval, $thisSetting[$tag] );
} else {
$retval = $thisSetting[$tag];
@@
-61,7
+61,7
@@
class SiteConfiguration {
// Do suffix settings
if ( array_key_exists( $suffix, $thisSetting ) ) {
// Do suffix settings
if ( array_key_exists( $suffix, $thisSetting ) ) {
- if ( is_array($retval) && is_array($thisSetting[$suffix]) ) {
+ if ( is
set($retval) && is
_array($retval) && is_array($thisSetting[$suffix]) ) {
$retval = array_merge( $retval, $thisSetting[$suffix] );
} else {
$retval = $thisSetting[$suffix];
$retval = array_merge( $retval, $thisSetting[$suffix] );
} else {
$retval = $thisSetting[$suffix];
@@
-75,7
+75,7
@@
class SiteConfiguration {
// Fall back to default.
if ( array_key_exists( 'default', $thisSetting ) ) {
// Fall back to default.
if ( array_key_exists( 'default', $thisSetting ) ) {
- if ( is_array($retval) && is_array($thisSetting['default']) ) {
+ if ( is
set($retval) && is
_array($retval) && is_array($thisSetting['default']) ) {
$retval = array_merge( $retval, $thisSetting['default'] );
} else {
$retval = $thisSetting['default'];
$retval = array_merge( $retval, $thisSetting['default'] );
} else {
$retval = $thisSetting['default'];