From 7d247a3cecc7d9f7d6e3c84a3589c591d7ed09c0 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 11 Oct 2014 10:41:57 +0200
Subject: preserve comments in less if 'compress' config disabled

Otherwise comments are never visible in css.php
---
 lib/exe/css.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/exe/css.php')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 6c1d60751..f7235fd4e 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -166,8 +166,11 @@ function css_out(){
  * @return string
  */
 function css_parseless($css) {
+    global $conf;
+
     $less = new lessc();
     $less->importDir[] = DOKU_INC;
+    $less->setPreserveComments(!$conf['compress']);
 
     if (defined('DOKU_UNITTEST')){
         $less->importDir[] = TMP_DIR;
-- 
cgit v1.2.3


From fd18b5f4e227c2b114d961b81feecce658597226 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 22 Oct 2014 11:07:46 +0200
Subject: visibility from private to protected for DokuCssFile

---
 lib/exe/css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/exe/css.php')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index f7235fd4e..9645b96bc 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -421,7 +421,7 @@ class DokuCssFile {
 
     protected $filepath;             // file system path to the CSS/Less file
     protected $location;             // base url location of the CSS/Less file
-    private   $relative_path = null;
+    protected $relative_path = null;
 
     public function __construct($file) {
         $this->filepath = $file;
@@ -454,7 +454,7 @@ class DokuCssFile {
      *
      * @return string   relative file system path
      */
-    private function getRelativePath(){
+    protected function getRelativePath(){
 
         if (is_null($this->relative_path)) {
             $basedir = array(DOKU_INC);
-- 
cgit v1.2.3