Changeset 496736

Timestamp:

01/29/2012 04:57:01 AM (14 years ago)

Author:

error

Message:

Fix error with loading defaults when settings.ini is absent

Location:

bad-behavior/branches/2.1

Files:

• bad-behavior-generic.php (modified) (1 diff)
• bad-behavior-mediawiki.php (modified) (1 diff)

bad-behavior/branches/2.1/bad-behavior-generic.php

@@ -97 +97 @@
     global $bb2_settings_defaults;
     $settings = @parse_ini_file(dirname(__FILE__) . "/settings.ini");
+    if (!$settings) $settings = array();
     return @array_merge($bb2_settings_defaults, $settings);
 }

bad-behavior/branches/2.1/bad-behavior-mediawiki.php

@@ -111 +111 @@
     global $bb2_settings_defaults;
     $settings = @parse_ini_file(dirname(__FILE__) . "/settings.ini");
+    if (!$settings) $settings = array();
     return @array_merge($bb2_settings_defaults, $settings);
 }