[geeklog-cvs] Geeklog-1.x/system lib-plugins.php,1.146,1.147

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv58568/system

Modified Files:
	lib-plugins.php 
Log Message:
Make 'list' the default in PLG_afterSaveSwitch, just in case (and forgot to handle 'user' as a special "plugin" case)


Index: lib-plugins.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-plugins.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** lib-plugins.php	23 May 2008 21:07:14 -0000	1.146
--- lib-plugins.php	23 May 2008 21:35:37 -0000	1.147
***************
*** 2318,2335 ****
          $url = $item_url;
          if (!empty($msg)) {
!             $url .= '&' . $msg;
!         }
!         break;
! 
!     case 'list':
!         if ($plugin == 'story') {
!             $url = $_CONF['site_admin_url'] . "/$plugin.php";
!         } elseif ($plugin == 'user') {
!             $url = $_CONF['site_admin_url'] . "/user.php";
!         } else {
!             $url = $_CONF['site_admin_url'] . "/plugins/$plugin/index.php";
!         }
!         if (!empty($msg)) {
!             $url .= '?' . $msg;
          }
          break;
--- 2318,2322 ----
          $url = $item_url;
          if (!empty($msg)) {
!             $url .= '&' . $msg;
          }
          break;
***************
*** 2339,2343 ****
          if (!empty($msg)) {
              $url .= '?' . $msg;
!             if ($plugin != 'story') {
                  $url .= '&plugin=' . $plugin;
              }
--- 2326,2330 ----
          if (!empty($msg)) {
              $url .= '?' . $msg;
!             if (($plugin != 'story') && ($plugin != 'user')) {
                  $url .= '&plugin=' . $plugin;
              }
***************
*** 2349,2353 ****
          if (!empty($msg)) {
              $url .= '?' . $msg;
!             if ($plugin != 'story') {
                  $url .= '&plugin=' . $plugin;
              }
--- 2336,2340 ----
          if (!empty($msg)) {
              $url .= '?' . $msg;
!             if (($plugin != 'story') && ($plugin != 'user')) {
                  $url .= '&plugin=' . $plugin;
              }
***************
*** 2357,2360 ****
--- 2344,2361 ----
      case 'plugin':
          $url = $_CONF['site_url'] . "/$plugin/index.php";
+         if (!empty($msg)) {
+             $url .= '?' . $msg;
+         }
+         break;
+ 
+     case 'list':
+     default:
+         if ($plugin == 'story') {
+             $url = $_CONF['site_admin_url'] . "/$plugin.php";
+         } elseif ($plugin == 'user') {
+             $url = $_CONF['site_admin_url'] . "/user.php";
+         } else {
+             $url = $_CONF['site_admin_url'] . "/plugins/$plugin/index.php";
+         }
          if (!empty($msg)) {
              $url .= '?' . $msg;