Commit 60c8cc66 authored by Tsachi Shlidor's avatar Tsachi Shlidor
Browse files

issue #1740098 by FiNeX - file_directory_path has been removed from Drupal 7

parent 38a5ce0f

includes/sass.inc

+2 −2
Changes for includes/sass.inc: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ function sasson_pre_render($elements) { 
    $fparts = explode(".", $last);

    $name = reset($fparts);

    $theme_name = $parts[array_search('themes', $parts)+1];

    $directory = variable_get('file_directory_path', conf_path() . '/files') . '/sasson/' . $theme_name . '/stylesheets';

    $directory = variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files') . '/sasson/' . $theme_name . '/stylesheets';

    $path = $directory . '/' . $name . '.css';

    $cid = 'sasson:css:' . $theme_name . ':' . $name;

    $cached = cache_get($cid, 'cache_page');
@@ -193,7 +193,7 @@ function sasson_parse($data, $file, $syntax, $theme_name) { 
    'cache' => FALSE,

    'syntax' => $syntax,

    'filename' => $file['data'],

    'directory' => variable_get('file_directory_path', conf_path() . '/files') . '/sasson/' . $theme_name,

    'directory' => variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files') . '/sasson/' . $theme_name,

    'load_paths' => $paths,

    '_load_paths' => $load_paths,

    'debug_info' => theme_get_setting('sasson_devel'),

includes/sprites.inc

+1 −1
Changes for includes/sprites.inc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ class Sprite { 


  function generate_sprite($sname, $theme_name) {



    $sprite_dir = variable_get('file_directory_path', conf_path() . '/files') . '/sasson/' . $theme_name . '-sprites/';

    $sprite_dir = variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files') . '/sasson/' . $theme_name . '-sprites/';

    $sprite_name = $sname . '-sprite';

    $options = array(

      'sname' => $sname,

template.php

+1 −1
Changes for template.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ function sasson_css_include() { 
        $extension = drupal_substr($file, -5);

        if (!theme_get_setting('sasson_sass') && in_array($extension, array('.scss', '.sass'))) {

          // If it's a sass file and the compiler is off, try finding the compiled css file.

          $path = variable_get('file_directory_path', conf_path() . '/files') . '/sasson/' . $theme->name;

          $path = variable_get('file_' . file_default_scheme() . '_path', conf_path() . '/files') . '/sasson/' . $theme->name;

          $fileinfo = pathinfo($file);         

          if (file_exists($file = drupal_get_path('theme', $theme->name) . '/' . str_replace($extension, '.css', $file))) {

            drupal_add_css($file, $style['options']);