[xoops-svn] SF.net SVN: xoops-svn:[10271] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<tr...@us...>]

Revision: 10271
          http://sourceforge.net/p/xoops/svn/10271
Author:   trabis
Date:     2012-11-25 01:21:41 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Fixing some notification related bugs

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php	2012-11-24 00:09:14 UTC (rev 10270)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/notification_functions.php	2012-11-25 01:21:41 UTC (rev 10271)
@@ -139,7 +139,7 @@
 {
     $xoops = Xoops::getInstance();
     if (!isset($module_id)) {
-        $module_id = !$xoops->isModule() ? $xoops->module->getVar('mid') : 0;
+        $module_id = $xoops->isModule() ? $xoops->module->getVar('mid') : 0;
         $module = $xoops->module;
     } else {
         $module = $xoops->getHandlerModule()->getById($module_id);

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html	2012-11-24 00:09:14 UTC (rev 10270)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html	2012-11-25 01:21:41 UTC (rev 10271)
@@ -2,7 +2,7 @@
 	<form name="notification_select" action="<{$xoops_notification.target_page}>" method="post">
 		<h4 class="txtcenter"><{$lang_activenotifications}></h4>
 		<input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" />
-		<input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo $xoops->security->createToken();<{/php}>" />
+		<input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo Xoops::getInstance()->security->createToken();<{/php}>" />
 		<table class="outer">
 		  <tr><th colspan="3"><{$lang_notificationoptions}></th></tr>
 		  <tr>