Domain tests / domain get function failing due to merge in of domain loc_block table

here is the backtrace:

this is due to the fact that domain_id has a value of 'all' which is not an integer and thus things fail

</pre></p><p></p><p>backTrace</p><p><pre>#0 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/CRM/Core/Error.php(265): CRM_Core_Error::backtrace()
#1 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/CRM/Core/BAO/Domain.php(82): CRM_Core_Error::fatal()
#2 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/CRM/Core/BAO/Domain.php(103): CRM_Core_BAO_Domain::getDomain("all")
#3 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/CRM/Core/BAO/Setting.php(599): CRM_Core_BAO_Domain::setDomain("all")
#4 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/CRM/Core/Invoke.php(467): CRM_Core_BAO_Setting::updateSettingsFromMetaData()
#5 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/api/v3/System.php(58): CRM_Core_Invoke::rebuildMenuAndCaches("1", "1")
#6 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/api/api.php(66): civicrm_api3_system_flush((Array:4))
#7 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/bin/cli.class.php(99): civicrm_api("System", "flush", (Array:4))
#8 /home/lobo/www/drupal-7.15/sites/crm_43/modules/civicrm/bin/cli.php(31): civicrm_cli->callApi()
#9

{main}

• make sure api_v3_DomainTest pass without error