Permalink
Browse files

Fixed Tabs vs Spaces

  • Loading branch information...
1 parent b3ab44a commit b6736e45b6ec10c773d459f1221f3a9b9af1097f @devlinjunker devlinjunker committed Mar 12, 2013
Showing with 14 additions and 16 deletions.
  1. +2 −4 library/SimplePie/Cache/MySQL.php
  2. +12 −12 library/SimplePie/Misc.php
@@ -96,10 +96,8 @@ public function __construct($location, $name, $type)
'prefix' => '',
),
);
-
- $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
-
-
+
+ $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
// Path is prefixed with a "/"
$this->options['dbname'] = substr($this->options['path'], 1);
View
@@ -227,18 +227,18 @@ public static function fix_protocol($url, $http = 1)
public static function array_merge_recursive($array1, $array2)
{
foreach ($array2 as $key => $value)
- {
- if (is_array($value))
- {
- $array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
- }
- else
- {
- $array1[$key] = $value;
- }
- }
-
- return $array1;
+ {
+ if (is_array($value))
+ {
+ $array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
+ }
+ else
+ {
+ $array1[$key] = $value;
+ }
+ }
+
+ return $array1;
}
public static function parse_url($url)

0 comments on commit b6736e4

Please sign in to comment.