Index: branches/5.2.x/core/kernel/globals.php
===================================================================
diff -u -N -r14585 -r14609
--- branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 14585)
+++ branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 14609)
@@ -1,6 +1,6 @@
isDebugMode();
}
- if ($is_debug) {
- if ($label) {
+ if ( $is_debug && isset($application) ) {
+ if ( $label ) {
$application->Debugger->appendHTML('' . $label . '');
}
$application->Debugger->dumpVars($data);
}
else {
- if ($label) {
+ if ( $label ) {
echo '' . $label . '
';
}
@@ -155,6 +156,10 @@
require($file);
if ($parse_section) {
+ if ( isset($_CONFIG['Database']['LoadBalancing']) && $_CONFIG['Database']['LoadBalancing'] ) {
+ require FULL_PATH . DIRECTORY_SEPARATOR . 'system' . DIRECTORY_SEPARATOR . 'db_servers.php';
+ }
+
return $_CONFIG;
}
@@ -316,6 +321,9 @@
*
* @param string $url
* @param mixed $data
+ * @param Array $headers
+ * @param string $request_type
+ * @param Array $curl_options
* @return string
* @access public
* @deprecated