From 1630c115da77ca7ca77f0a154f88cc53ad5e1ba2 Mon Sep 17 00:00:00 2001
From: Gregory Perry <lotyrin@gmail.com>
Date: Tue, 17 Apr 2012 18:41:28 +0000
Subject: [PATCH 1/3] Remove extra space around concatenation in authorize.inc

---
 core/includes/authorize.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/core/includes/authorize.inc b/core/includes/authorize.inc
index cf55624..ce0fc1a 100644
--- a/core/includes/authorize.inc
+++ b/core/includes/authorize.inc
@@ -216,7 +216,7 @@ function authorize_filetransfer_form_validate($form, &$form_state) {
       // The format of this error message is similar to that used on the
       // database connection form in the installer.
       form_set_error('connection_settings', t('Failed to connect to the server. The server reports the following message: !message For more help installing or updating code on your server, see the <a href="@handbook_url">handbook</a>.', array(
-        '!message' => '<p class="error">' . $e->getMessage()  . '</p>',
+        '!message' => '<p class="error">' . $e->getMessage() . '</p>',
         '@handbook_url' => 'http://drupal.org/documentation/install/modules-themes',
       )));
     }
-- 
1.7.5.4


From 93bc9052f5553d0862986497e89d524af9182585 Mon Sep 17 00:00:00 2001
From: Gregory Perry <lotyrin@gmail.com>
Date: Tue, 17 Apr 2012 18:42:04 +0000
Subject: [PATCH 2/3] Add space around concatenation in common.inc

---
 core/includes/common.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/includes/common.inc b/core/includes/common.inc
index 5ff6167..9a2c401 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -3734,12 +3734,12 @@ function _drupal_load_stylesheet($matches) {
   $directory = dirname($filename);
   // If the file is in the current directory, make sure '.' doesn't appear in
   // the url() path.
-  $directory = $directory == '.' ? '' : $directory .'/';
+  $directory = $directory == '.' ? '' : $directory . '/';
 
   // Alter all internal url() paths. Leave external paths alone. We don't need
   // to normalize absolute paths here (i.e. remove folder/... segments) because
   // that will be done later.
-  return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1'. $directory, $file);
+  return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1' . $directory, $file);
 }
 
 /**
-- 
1.7.5.4


From a251a3b9cf4e34dfb3cb7887892c0bcf88c9324f Mon Sep 17 00:00:00 2001
From: Gregory Perry <lotyrin@gmail.com>
Date: Tue, 17 Apr 2012 18:43:04 +0000
Subject: [PATCH 3/3] Various coding standards changes in common.inc

---
 core/includes/config.inc |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/includes/config.inc b/core/includes/config.inc
index b438977..75b68bf 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -168,18 +168,18 @@ function config_decode($data) {
  */
 function config_xml_to_array($data) {
   $out = array();
-  $xmlObject = simplexml_load_string($data);
+  $xml_object = simplexml_load_string($data);
 
-  if (is_object($xmlObject)) {
-    $attributes = (array) $xmlObject->attributes();
+  if (is_object($xml_object)) {
+    $attributes = (array) $xml_object->attributes();
     if (isset($attributes['@attributes'])) {
       $out['#attributes'] = $attributes['@attributes'];
     }
   }
-  if (trim((string) $xmlObject)) {
-    return trim((string) $xmlObject);
+  if (trim((string) $xml_object)) {
+    return trim((string) $xml_object);
   }
-  foreach ($xmlObject as $index => $content) {
+  foreach ($xml_object as $index => $content) {
     if (is_object($content)) {
       $out[$index] = config_xml_to_array($content);
     }
@@ -208,8 +208,8 @@ function config_encode($data) {
 
   // Pretty print the result.
   $dom = new DOMDocument('1.0');
-  $dom->preserveWhiteSpace = false;
-  $dom->formatOutput = true;
+  $dom->preserveWhiteSpace = FALSE;
+  $dom->formatOutput = TRUE;
   $dom->loadXML($xml_object->asXML());
 
   return $dom->saveXML();
@@ -228,7 +228,7 @@ function config_encode($data) {
 function config_array_to_xml($array, &$xml_object) {
   foreach ($array as $key => $value) {
     if (is_array($value)) {
-      if (!is_numeric($key)){
+      if (!is_numeric($key)) {
         $subnode = $xml_object->addChild("$key");
         config_array_to_xml($value, $subnode);
       }
-- 
1.7.5.4