Fixed a bug that included ups.phtml in adminhtml also if Mage_Usa was disabled (#2975)

Author: luigifab

app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php

@@ -113,9 +113,12 @@ public function editAction()
             $block = $this->getLayout()->createBlock('adminhtml/system_config_edit');
             $this->_addContent($block->initForm());
 
-            $this->_addJs($this->getLayout()
-                ->createBlock('adminhtml/template')
-                ->setTemplate('system/shipping/ups.phtml'));
+            if (($current == 'carriers') && Mage::helper('core')->isModuleEnabled('Mage_Usa')) {
+                $this->_addJs($this->getLayout()
+                     ->createBlock('adminhtml/template')
+                     ->setTemplate('system/shipping/ups.phtml'));
+            }
+
             $this->_addJs($this->getLayout()
                 ->createBlock('adminhtml/template')
                 ->setTemplate('system/config/js.phtml'));