[xoops-svn] SF.net SVN: xoops-svn:[12712] XoopsCore/branches/2.5.x/2.5.7

[<be...@us...>]

Revision: 12712
          http://sourceforge.net/p/xoops/svn/12712
Author:   beckmi
Date:     2014-07-14 07:53:04 +0000 (Mon, 14 Jul 2014)
Log Message:
-----------
Fixing typo (Timgno)
fix for Update setting Template import date to 0 (timgno/mamba)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-07-14 07:53:04 UTC (rev 12712)
@@ -1,9 +1,17 @@
 XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
 
+
 ===============================
-2014-06-14: Version 2.5.7 Final (Patch)
+NOT RELEASED Version 2.5.7 Final (Patch 2)
 ===============================
+- Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages.  (rgriffith)
+- fix for Update setting Template import date to 0 (timgno/mamba)
 
+
+===============================
+2014-06-14: Version 2.5.7 Final (Patch 1)
+===============================
+
 - Updating docu for the correct version of tablesorter (mamba)
 - Fix path specified for include (rgriffith, mamba)
 - added mainfile.php to /extras for use on servers where write to root is not possible (rgriffith)

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php	2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php	2014-07-14 07:53:04 UTC (rev 12712)
@@ -582,7 +582,7 @@
                     $tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0];
                     // END irmtfan solve templates duplicate issue
                         $tplfile->setVar('tpl_refid', $newmid);
-                        $tplfile->setVar('tpl_lastimported', 0);
+//                        $tplfile->setVar('tpl_lastimported', 0);
                         $tplfile->setVar('tpl_lastmodified', time());
                             $tplfile->setVar('tpl_type', $type);
                         $tplfile->setVar('tpl_source', $tpldata, true);
@@ -686,7 +686,7 @@
                                     $tplfile_new->setVar('tpl_source', $content, true);
                                     $tplfile_new->setVar('tpl_desc', $block['description'], true);
                                     $tplfile_new->setVar('tpl_lastmodified', time());
-                                    $tplfile_new->setVar('tpl_lastimported', 0);
+//                                    $tplfile_new->setVar('tpl_lastimported', 0);
                                     $tplfile_new->setVar(
                                         'tpl_file',
                                         $block['template'],

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php	2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php	2014-07-14 07:53:04 UTC (rev 12712)
@@ -515,7 +515,7 @@
     } else {
         $msgs = array();
         $msgs[] = '<div id="xo-module-log"><div class="header">';
-        $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTAL  . $module->getInfo('name', 's') . '</h4>';
+        $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTALL  . $module->getInfo('name', 's') . '</h4>';
         if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
             $msgs[] ='<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" />';
         }

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php	2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php	2014-07-14 07:53:04 UTC (rev 12712)
@@ -18,7 +18,6 @@
 define('_AM_SYSTEM_MODULES_RUSUREUPD',"Press the button below to update this module");
 define('_AM_SYSTEM_MODULES_BTOMADMIN',"XOOPS Module Administration");
 define('_AM_SYSTEM_MODULES_INSTALLING',"Installing ");
-define('_AM_SYSTEM_MODULES_UNINSTAL',"Uninstall ");
 define('_AM_SYSTEM_MODULES_DEACTIVATE',"Deactivate ");
 define('_AM_SYSTEM_MODULES_ACTIVATE',"Activate ");
 define('_AM_SYSTEM_MODULES_UPDATING',"Updating ");