From 25aeefa5b962f3594c8de549714fd60a377ebeb1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 16 Apr 2013 18:31:47 +0900
Subject: [PATCH] =?UTF-8?q?css,=20js=20=ED=8C=8C=EC=9D=BC=20=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=EC=8B=9C=20=ED=8C=8C=EC=9D=BC=EB=AA=85=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20sort=20=EC=BD=94=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index aafe3d365..9665a7f76 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1804,6 +1804,7 @@ function get_skin_stylesheet($skin_path, $dir='')
         return "";
 
     $str = "";
+    $files = array();
 
     if($dir)
         $skin_path .= '/'.$dir;
@@ -1820,22 +1821,30 @@ function get_skin_stylesheet($skin_path, $dir='')
                     continue;
 
                 if(preg_match("/\.(css)$/i", $file))
-                    $str .= '<link rel="stylesheet" href="'.$skin_url.'/'.$file.'?='.date("md").'">'."\n";
+                    $files[] = $file;
             }
             closedir($dh);
         }
     }
 
+    if(!empty($files)) {
+        sort($files);
+
+        foreach($files as $file) {
+            $str .= '<link rel="stylesheet" href="'.$skin_url.'/'.$file.'?='.date("md").'">'."\n";
+        }
+    }
+
     return $str;
-    
+
     /*
     // glob 를 이용한 코드
     if (!$skin_path) return '';
     $skin_path .= $dir ? '/'.$dir : '';
-    
+
     $str = '';
     $skin_url = G4_URL.str_replace('\\', '/', str_replace(G4_PATH, '', $skin_path));
-    
+
     foreach (glob($skin_path.'/*.css') as $filepath) {
         $file = str_replace($skin_path, '', $filepath);
         $str .= '<link rel="stylesheet" href="'.$skin_url.'/'.$file.'?='.date('md').'">'."\n";
@@ -1851,6 +1860,7 @@ function get_skin_javascript($skin_path, $dir='')
         return "";
 
     $str = "";
+    $files = array();
 
     if($dir)
         $skin_path .= '/'.$dir;
@@ -1867,12 +1877,20 @@ function get_skin_javascript($skin_path, $dir='')
                     continue;
 
                 if(preg_match("/\.(js)$/i", $file))
-                    $str .= '<script src="'.$skin_url.'/'.$file.'"></script>'."\n";
+                    $files[] = $file;
             }
             closedir($dh);
         }
     }
 
+    if(!empty($files)) {
+        sort($files);
+
+        foreach($files as $file) {
+            $str .= '<script src="'.$skin_url.'/'.$file.'"></script>'."\n";
+        }
+    }
+
     return $str;
 }