commit 38cd70a1161a8552c18495eca15e88cc0fa33245
Author: Quentin Albrand <quentin.albrand@gmail.com>
Date:   Thu Mar 15 16:16:08 2012 +0100

    Testing a fix for : #1156482

diff --git a/plugins/sweaver_plugin_editor/sweaver_plugin_editor.inc b/plugins/sweaver_plugin_editor/sweaver_plugin_editor.inc
index 0dd1bb5..17d9a44 100644
--- a/plugins/sweaver_plugin_editor/sweaver_plugin_editor.inc
+++ b/plugins/sweaver_plugin_editor/sweaver_plugin_editor.inc
@@ -519,7 +519,7 @@ class sweaver_plugin_editor extends sweaver_plugin {
             '#type' => 'managed_file',
             '#title' => $property->description,
             '#size' => '40',
-            '#upload_location' => file_default_scheme() . '://sweaver/',
+            '#upload_location' => 'public://sweaver/',
             '#upload_validators' => array(
               'file_validate_is_image' => array(),
               'file_validate_extensions' => array('png gif jpg jpeg'),
diff --git a/plugins/sweaver_plugin_images/sweaver_plugin_images.inc b/plugins/sweaver_plugin_images/sweaver_plugin_images.inc
index 4232869..4bd7b97 100644
--- a/plugins/sweaver_plugin_images/sweaver_plugin_images.inc
+++ b/plugins/sweaver_plugin_images/sweaver_plugin_images.inc
@@ -79,16 +79,16 @@ class sweaver_plugin_images extends sweaver_plugin {
         'file_validate_is_image' => array(),
       );
 
-      $sweaver_directory = file_default_scheme() . '://sweaver';
+      $sweaver_directory = 'public://sweaver';
       file_prepare_directory($sweaver_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-      $image = file_save_upload('image_image', $validators, file_default_scheme() . '://sweaver');
+      $image = file_save_upload('image_image', $validators, 'public://sweaver');
 
       if ($image && !empty($form_state['values']['image_description'])) {
         $image->description = $form_state['values']['image_description'];
         $image_parts = explode('.', $image->uri);
         $extension = array_pop($image_parts);
 
-        $new_image_name = file_default_scheme() . '://sweaver/sweaver_image_' . $image->fid . '.' . $extension;
+        $new_image_name = 'public://sweaver/sweaver_image_' . $image->fid . '.' . $extension;
         file_unmanaged_move($image->uri, $new_image_name);
 
         // Save permanent.
@@ -288,9 +288,9 @@ class sweaver_plugin_images extends sweaver_plugin {
       'file_validate_is_image' => array(),
     );
 
-    $sweaver_directory = file_default_scheme() . '://sweaver';
+    $sweaver_directory = 'public://sweaver';
     file_prepare_directory($sweaver_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-    $image = file_save_upload('image', $validators, file_default_scheme() . '://sweaver');
+    $image = file_save_upload('image', $validators, 'public://sweaver');
     if ($image) {
       $form_state['image'] = $image;
     }
@@ -310,7 +310,7 @@ class sweaver_plugin_images extends sweaver_plugin {
       $image->fid = $image_uploaded->fid;
       $image_parts = explode('.', $image_uploaded->uri);
       $extension = array_pop($image_parts);
-      $new_image_name = file_default_scheme() . '://sweaver/sweaver_image_' . $image_uploaded->fid . '.' . $extension;
+      $new_image_name = 'public://sweaver/sweaver_image_' . $image_uploaded->fid . '.' . $extension;
       file_unmanaged_move($image_uploaded->uri, $new_image_name);
 
       // Resave.
diff --git a/plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc b/plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc
index e41e941..f35abe3 100644
--- a/plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc
+++ b/plugins/sweaver_plugin_styles/sweaver_plugin_styles.inc
@@ -257,7 +257,7 @@ class sweaver_plugin_styles extends sweaver_plugin {
    */
   public function sweaver_form_submit($form, &$form_state) {
       
-    $sweaver_directory = file_default_scheme() . '://sweaver';
+    $sweaver_directory = 'public://sweaver';
     file_prepare_directory($sweaver_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
 
     $styles_form = $form['sweaver_plugin_styles']['form'];
@@ -421,7 +421,7 @@ class sweaver_plugin_styles extends sweaver_plugin {
     $filename = 'sweaver_' . $style->theme . '_'. $style->style_id .'_'. $type .'.css';
 
     // Create the css within the files folder.
-    $sweaver_directory = file_default_scheme() . '://sweaver';
+    $sweaver_directory = 'public://sweaver';
     file_prepare_directory($sweaver_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
     $file = $sweaver_directory . '/' . $filename;
     if (!$fp = fopen($file, 'w')) {
@@ -474,13 +474,13 @@ class sweaver_plugin_styles extends sweaver_plugin {
   public function sweaver_delete_style($style) {
     db_query("DELETE FROM {sweaver_style} WHERE style_id = :style_id", array(':style_id' => $style->style_id));
     db_query("DELETE FROM {sweaver_style_draft} WHERE style_id = :style_id", array(':style_id' => $style->style_id));
-    $draft = file_default_scheme() . '://sweaver/sweaver_' . $style->theme . '_' . $style->style_id . '_draft.css';
-    $live = file_default_scheme() . '://sweaver/sweaver_' . $style->theme . '_' . $style->style_id . '_live.css';
+    $draft = 'public://sweaver/sweaver_' . $style->theme . '_' . $style->style_id . '_draft.css';
+    $live = 'public://sweaver/sweaver_' . $style->theme . '_' . $style->style_id . '_live.css';
     file_unmanaged_delete($draft);
     file_unmanaged_delete($live);
 
     // Remove files tied to theme.
-    $dir = file_default_scheme() . '://sweaver';
+    $dir = 'public://sweaver';
     $mask = '/(.*)' . $style->theme . '_' . $style->style_id . '_(.*)/';
     $files = file_scan_directory($dir, $mask);
     // Get temp files.
diff --git a/plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc b/plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc
index 22421aa..c234935 100644
--- a/plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc
+++ b/plugins/sweaver_plugin_themesettings/sweaver_plugin_themesettings.inc
@@ -162,7 +162,7 @@ class sweaver_plugin_themesettings extends sweaver_plugin {
         if (isset($form['sweaver_plugin_themesettings']['form']['#'. $file])) {
           $type = str_replace('_path', '', $file);
           $source_path = $form['sweaver_plugin_themesettings']['form']['#' . $file];
-          $dest_draft = file_default_scheme() . '://sweaver/' . $type . '_' . $theme_name . '_' . $style_id . '_draft.' . $form['sweaver_plugin_themesettings']['form']['#' . $file . '_extension'];
+          $dest_draft = 'public://sweaver/' . $type . '_' . $theme_name . '_' . $style_id . '_draft.' . $form['sweaver_plugin_themesettings']['form']['#' . $file . '_extension'];
           file_unmanaged_move($source_path, $dest_draft, FILE_EXISTS_REPLACE);
           $theme_values[$file] = $dest_draft;
           $theme_values[$default] = 0;
@@ -173,7 +173,7 @@ class sweaver_plugin_themesettings extends sweaver_plugin {
           $type = str_replace('_path', '', $file);
           $parts = pathinfo($theme_values[$file]);
           $temp_path = $theme_values[$file];
-          $dest_draft = file_default_scheme() . '://sweaver/' . $type . '_'. $theme_name . '_' . $style_id . '_draft.' . $parts['extension'];
+          $dest_draft = 'public://sweaver/' . $type . '_'. $theme_name . '_' . $style_id . '_draft.' . $parts['extension'];
           file_unmanaged_move($temp_path, $dest_draft, FILE_EXISTS_REPLACE);
           $theme_values[$file] = $dest_draft;
         }
@@ -295,7 +295,7 @@ class sweaver_plugin_themesettings extends sweaver_plugin {
     // so we can give it the right filename in the submit function.
     if ($file = file_save_upload('logo_upload', array('file_validate_is_image' => array()))) {
       $parts = pathinfo($file->uri);
-      $filename = file_default_scheme() . '://sweaver/temp_logo.' . $parts['extension'];
+      $filename = 'public://sweaver/temp_logo.' . $parts['extension'];
       $form['#logo_path'] = $filename;
       $form['#logo_path_extension'] = $parts['extension'];
 
@@ -313,7 +313,7 @@ class sweaver_plugin_themesettings extends sweaver_plugin {
     // so we can give it the right filename in the submit function.
     if ($file = file_save_upload('favicon_upload')) {
       $parts = pathinfo($file->uri);
-      $filename = file_default_scheme() . '://sweaver/temp_favicon.' . $parts['extension'];
+      $filename = 'public://sweaver/temp_favicon.' . $parts['extension'];
       $form['#favicon_path'] = $filename;
       $form['#favicon_path_extension'] = $parts['extension'];
 
diff --git a/sweaver.install b/sweaver.install
index 6257eb6..48ca39c 100644
--- a/sweaver.install
+++ b/sweaver.install
@@ -14,7 +14,7 @@ function sweaver_requirements($phase) {
   $t = get_t();
 
   if ($phase == 'runtime' || $phase == 'install') {
-    $sweaver_directory = file_default_scheme() . '://sweaver';
+    $sweaver_directory = 'public://sweaver';
     if (!file_prepare_directory($sweaver_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS)) {
       if (!is_dir($sweaver_directory)) {
         $requirements['sweaver_directory'] = array(
diff --git a/sweaver.module b/sweaver.module
index a388bab..8cc8a2a 100644
--- a/sweaver.module
+++ b/sweaver.module
@@ -358,7 +358,7 @@ function sweaver_preprocess_page(&$vars) {
         'preprocess' => TRUE,
         'group' => CSS_THEME,
       );
-      $css_path = file_default_scheme() . '://sweaver/sweaver_' . $sweaver->get_theme_key() . '_' . $sweaver_style->style_id . '_' . $sweaver_style->type . '.css';
+      $css_path = 'public://sweaver/sweaver_' . $sweaver->get_theme_key() . '_' . $sweaver_style->style_id . '_' . $sweaver_style->type . '.css';
       drupal_add_css($css_path, $settings);
 
       foreach (array_keys($sweaver->get_plugins_registry(TRUE)) as $plugin_name) {
diff --git a/tests/sweaver.themesettings.test b/tests/sweaver.themesettings.test
index 942380e..abd38d5 100644
--- a/tests/sweaver.themesettings.test
+++ b/tests/sweaver.themesettings.test
@@ -134,7 +134,7 @@ class sweaverThemeSettings extends DrupalWebTestCase {
       else {
         $source = drupal_get_path('module', 'sweaver') .'/tests/'. $favicon;
         $parts = pathinfo($source);
-        $dest = file_default_scheme() . '://sweaver/temp_favicon.' . $parts['extension'];
+        $dest = 'public://sweaver/temp_favicon.' . $parts['extension'];
         $return = file_unmanaged_copy($source, $dest, FILE_EXISTS_REPLACE);
         $this->assertTrue($return, 'Favicon file copied to '. $dest .' for style id '. $style_id .' in scenario '. $scenario);
         $form['sweaver_plugin_themesettings']['form']['#favicon_path'] = $dest;
@@ -153,7 +153,7 @@ class sweaverThemeSettings extends DrupalWebTestCase {
       else {
         $source = drupal_get_path('module', 'sweaver') .'/tests/'. $logo;
         $parts = pathinfo($source);
-        $dest = file_default_scheme() . '://sweaver/temp_logo.' . $parts['extension'];
+        $dest = 'public://sweaver/temp_logo.' . $parts['extension'];
         $return = file_unmanaged_copy($source, $dest, FILE_EXISTS_REPLACE);
         $this->assertTrue($return, 'Favicon file copied to '. $dest .' for style id '. $style_id .' in scenario '. $scenario);
         $form['sweaver_plugin_themesettings']['form']['#logo_path'] = $dest;