[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.39,1.40 serendipity_functions.inc.php,1.375,1.376 serendipity_sidebar_items.php,1.79,1.80

[Kristian K. <is...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6335

Modified Files:
	serendipity_admin_plugins.inc.php 
	serendipity_functions.inc.php serendipity_sidebar_items.php 
Log Message:
Okay, this code now works as I wanted it to work.



Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- serendipity_sidebar_items.php	28 Jul 2004 18:41:05 -0000	1.79
+++ serendipity_sidebar_items.php	28 Jul 2004 19:06:55 -0000	1.80
@@ -152,10 +152,11 @@
         // get local configuration (default, true, false)
         $use_links = $this->get_config('use_links', 'default');
         // get global configuration (true, false)
-        $global_use_link = serendipity_db_bool(serendipity_get_config_var('top_as_links', false, true));
+        $global_use_link = serendipity_get_config_var('top_as_links', false, true);
+
         // if local configuration say to use global default, do so
         if ($use_links == 'default') {
-            $use_links = $global_use_link;
+            $use_links = serendipity_db_bool($global_use_link);
         } else {
             $use_links = serendipity_db_bool($use_links);
         }
@@ -204,15 +205,16 @@
         // get local configuration (default, true, false)
         $use_links = $this->get_config('use_links', 'default');
         // get global configuration (true, false)
-        $global_use_link = serendipity_db_bool(serendipity_get_config_var('top_as_links', false, true));
+        $global_use_link = serendipity_get_config_var('top_as_links', false, true);
+
         // if local configuration say to use global default, do so
         if ($use_links == 'default') {
-            $use_links = $global_use_link;
+            $use_links = serendipity_db_bool($global_use_link);
         } else {
             $use_links = serendipity_db_bool($use_links);
         }
 
-        echo serendipity_displayTopReferrers($this->get_config('limit', 10), $use_links);
+        echo serendipity_displayTopExits($this->get_config('limit', 10), $use_links);
     }
 }
 

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_admin_plugins.inc.php	28 Jul 2004 17:59:47 -0000	1.39
+++ serendipity_admin_plugins.inc.php	28 Jul 2004 19:06:54 -0000	1.40
@@ -435,9 +435,9 @@
                     $id = htmlspecialchars($config_item . $radio_value);
                     $counter++;
                     $checked = "";
-                    if ($radio_value == 'true' && $hvalue === true)
+                    if ($radio_value == 'true' && $hvalue == 1)
                         $checked = " checked";
-                    if ($radio_value == 'false' && $is_unset == false && hvalue === false)
+                    if ($radio_value == 'false' && $is_unset == false && $hvalue == false)
                         $checked = " checked";
                     if ($radio_value == $hvalue)
                         $checked = " checked";

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- serendipity_functions.inc.php	28 Jul 2004 16:49:40 -0000	1.375
+++ serendipity_functions.inc.php	28 Jul 2004 19:06:54 -0000	1.376
@@ -3233,7 +3233,7 @@
 }
 
 function serendipity_displayTopReferrers($limit = 10, $use_links = true) {
-    serendipity_displayTopUrlList('referrers', $limit);
+    serendipity_displayTopUrlList('referrers', $limit, $use_links);
 }
 
 function serendipity_displayTopExits($limit = 10, $use_links = true) {