fixed drupal core declaration; added patch for #1525176