public
Description: Git mirror of the CMS Made Simple 2.0 rewrite
Homepage: http://cmsmadesimple.org
Clone URL: git://github.com/tedkulp/cmsmadesimple-2-0.git
Search Repo:
Fixed ordering issues with new stylesheet loading code.  Fixes #679.

git-svn-id: http://svn.cmsmadesimple.org/svn/cmsmadesimple/trunk@2812 
3d254a34-79dc-0310-9e5f-be208747d8a0
tedkulp (author)
Tue May 23 19:43:17 -0700 2006
commit  c5d736704bc292b4749dcfd9532c5df453cedb0d
tree    30663816bca6982efe3af0f66cbd911be0b7c84f
parent  1fec2d3bfc92d898bf2e720e84f345673f1180b3
...
62
63
64
65
 
66
67
68
...
76
77
78
79
 
80
81
82
...
62
63
64
 
65
66
67
68
...
76
77
78
 
79
80
81
82
0
@@ -62,7 +62,7 @@ if (isset($config['old_stylesheet']) && $config['old_stylesheet'] == false)
0
     if ($name != '')
0
       $sql="SELECT css_text, css_name FROM ".$config['db_prefix']."css WHERE css_name = '" . mysql_real_escape_string($name, $db) . "'";
0
     else
0
- $sql="SELECT c.css_text, c.css_id, c.css_name FROM ".$config['db_prefix']."css c,".$config['db_prefix']."css_assoc ac WHERE ac.assoc_type='template' AND ac.assoc_to_id = $templateid AND ac.assoc_css_id = c.css_id AND c.media_type = '" . mysql_real_escape_string($mediatype, $db) . "'";
0
+ $sql="SELECT c.css_text, c.css_id, c.css_name FROM ".$config['db_prefix']."css c,".$config['db_prefix']."css_assoc ac WHERE ac.assoc_type='template' AND ac.assoc_to_id = $templateid AND ac.assoc_css_id = c.css_id AND c.media_type = '" . mysql_real_escape_string($mediatype, $db) . "' ORDER BY ac.create_date";
0
     $result=mysql_query($sql);
0
     while ($result && $row = mysql_fetch_assoc($result))
0
     {
0
@@ -76,7 +76,7 @@ if (isset($config['old_stylesheet']) && $config['old_stylesheet'] == false)
0
     if ($name != '')
0
       $sql="SELECT css_text, css_name FROM ".$config['db_prefix']."css WHERE css_name = '" . pg_escape_string($name) . "'";
0
     else
0
- $sql="SELECT c.css_text, c.css_id, c.css_name FROM ".$config['db_prefix']."css c,".$config['db_prefix']."css_assoc ac WHERE ac.assoc_type='template' AND ac.assoc_to_id = $templateid AND ac.assoc_css_id = c.css_id AND c.media_type = '" . pg_escape_string($mediatype) . "'";
0
+ $sql="SELECT c.css_text, c.css_id, c.css_name FROM ".$config['db_prefix']."css c,".$config['db_prefix']."css_assoc ac WHERE ac.assoc_type='template' AND ac.assoc_to_id = $templateid AND ac.assoc_css_id = c.css_id AND c.media_type = '" . pg_escape_string($mediatype) . "' ORDER BY ac.create_date";
0
     while ($result && $row = pg_fetch_array($result, null, PGSQL_ASSOC))
0
     {
0
       $css .= "/* Start of CMSMS style sheet '{$row['css_name']}' */\n{$row['css_text']}\n/* End of '{$row['css_name']}' */\n";

Comments

    No one has commented yet.