Changeset 945 for trunk/wp-includes/template-functions-category.php

Timestamp:

02/26/2004 04:15:48 PM (22 years ago)

Author:

saxmatt

Message:

Removed global $siteurl and $blogfilename, use get_settings. Syntax fix for wp-db.

File:

• trunk/wp-includes/template-functions-category.php (modified) (5 diffs)

trunk/wp-includes/template-functions-category.php

@@ -17 +17 @@
 
 function get_category_link($echo = false, $category_id, $category_nicename) {
-    global $wpdb, $tablecategories, $post, $querystring_start, $querystring_equal, $siteurl, $blogfilename, $cache_categories;
+    global $wpdb, $tablecategories, $post, $querystring_start, $querystring_equal, $cache_categories;
     $cat_ID = $category_id;
     $permalink_structure = get_settings('permalink_structure');
     
     if ('' == $permalink_structure) {
-        $file = "$siteurl/$blogfilename";
+        $file = get_settings('siteurl') . '/' . get_settings('blogfilename');
         $link = $file.$querystring_start.'cat'.$querystring_equal.$cat_ID;
     } else {
@@ -28 +28 @@
         // Get any static stuff from the front
         $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
-        $link = $siteurl . $front . 'category/';
+        $link = get_settings('siteurl') . $front . 'category/';
         if ($parent=$cache_categories[$category_id]->category_parent) $link .= get_category_parents($parent, FALSE, '/', TRUE);
         $link .= $category_nicename . '/';
@@ -38 +38 @@
 
 function get_category_rss_link($echo = false, $category_id, $category_nicename) {
-       global $querystring_start, $querystring_equal, $siteurl;
+       global $querystring_start, $querystring_equal;
        $cat_ID = $category_id;
        $permalink_structure = get_settings('permalink_structure');
 
        if ('' == $permalink_structure) {
-               $file = "$siteurl/wp-rss2.php";
+               $file = get_settings('siteurl') . '/wp-rss2.php';
         $link = $file . $querystring_start . 'cat' . $querystring_equal . $category_id;
        } else {
@@ -186 +186 @@
         $selected=0, $hide=0) {
     global $tablecategories, $tableposts, $tablepost2cat, $wpdb;
-    global $pagenow, $siteurl, $blogfilename;
+    global $pagenow;
     global $querystring_start, $querystring_equal, $querystring_separator;
-    if (($file == 'blah') || ($file == '')) $file = "$siteurl/$blogfilename";
+    if (($file == 'blah') || ($file == '')) $file = get_settings('siteurl') . '/' . get_settings('blogfilename');
     if (!$selected) $selected=$cat;
     $sort_column = 'cat_'.$sort_column;
@@ -253 +253 @@
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0) {
     global $tablecategories, $tableposts, $tablepost2cat, $wpdb;
-    global $pagenow, $siteurl, $blogfilename;
+    global $pagenow;
     global $querystring_start, $querystring_equal, $querystring_separator;
     // Optiondates now works
     if ('' == $file) {
-        $file = "$siteurl/$blogfilename";
+        $file = "$siteurl/" . get_settings('blogfilename');
     }
     if (intval($categories)==0){