revert tagMenu.xml and query.js changes

wagle · Aug 23, 2013 · 5656c21 · 5656c21
1 parent 6aa46fe
commit 5656c21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/content/query.js b/content/query.js
@@ -1223,8 +1223,8 @@ BookmarkTags.Query= function ()
                   "folders.parent != ",
                       BookmarkTags.Util.bmServ.tagsFolder, " ",
             "GROUP BY bms.id ",
-            "ORDER BY ", "'" + query.bmSort + "'", " COLLATE NOCASE ", query.bmSortDir,
-                     ", 'title' COLLATE NOCASE ASC"
+            "ORDER BY ", query.bmSort, " COLLATE NOCASE ", query.bmSortDir,
+                     ", title COLLATE NOCASE ASC"
         ].join("");
     }
 
@@ -1256,9 +1256,9 @@ BookmarkTags.Query= function ()
             "FROM (", sql, ") AS t, moz_bookmarks AS tags ",
             "WHERE t.tagid = tags.id ",
             "GROUP BY id ",
-            "ORDER BY ", "'" + query.relTagSort + "'",
+            "ORDER BY ", query.relTagSort,
                           " COLLATE NOCASE ", query.relTagSortDir, ", ",
-                     "'title' COLLATE NOCASE ASC"
+                     "title COLLATE NOCASE ASC"
         ].join("");
     }
 

diff --git a/content/tagMenu.xml b/content/tagMenu.xml
@@ -529,7 +529,7 @@
                            BookmarkTags.Util.bmServ.tagsFolder, " AND ",
                       "t.id = bms.parent ",
                 "GROUP BY t.id ",
-                "ORDER BY ", prefix, ", ", "'", sort[0], "'", " COLLATE NOCASE ", sort[1]
+                "ORDER BY ", prefix, ", ", sort[0], " COLLATE NOCASE ", sort[1]
             ].join("");
         }
 
@@ -573,7 +573,7 @@
                                  ") AND ",
                       "bms.parent = t.id ",
                 "GROUP BY t.id ",
-                "ORDER BY ", prefix, ", ", "'", sort[0], "'", " COLLATE NOCASE ", sort[1]
+                "ORDER BY ", prefix, ", ", sort[0], " COLLATE NOCASE ", sort[1]
             ].join("");
         }