Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12520] XoopsCore/branches/2.5.x/2.5.7
|
From: <be...@us...> - 2014-05-05 12:45:26
|
Revision: 12520
http://sourceforge.net/p/xoops/svn/12520
Author: beckmi
Date: 2014-05-05 12:45:22 +0000 (Mon, 05 May 2014)
Log Message:
-----------
- fixed missing .tpl in Profile (cesag/slider84)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.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-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-05-05 12:45:22 UTC (rev 12520)
@@ -6,8 +6,12 @@
- updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec)
- added .tpl to XoopsList's getHtmlListAsArray (wizanda)
- updating xBootstrap (voltan, Angelo Rocha)
-- correcting typos (cesag)
+- moved all images, CSS, and JS files to /assets in modules Profile and PM (mamba)
+- renamed .html Smarty templates to .tpl in modules Profile and PM (mamba)
+- corrected English typos (cesag)
+- added missing .php file extension (AngeloRocha/Zyspec/rgriffith)
+
===============================
2014/04/06: Version 2.5.7 RC 1
===============================
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
$path = dirname(dirname(dirname(dirname(__FILE__))));
include_once $path . '/mainfile.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
/**
* @package kernel
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
/**
* @package kernel
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
/**
* @package kernel
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
/**
* Class ProfileRegstep
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
/**
* Class ProfileVisibility
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/docs/changelog.txt 2014-05-05 12:45:22 UTC (rev 12520)
@@ -2,6 +2,7 @@
--------------------------------------
- moved all images, CSS, and JS files to /assets (mamba)
- renamed .html Smarty templates to .tpl (mamba)
+- fixed missing .tpl (cesag/slider84)
1.64 Final
--------------------------------------
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+// defined('XOOPS_ROOT_PATH') || die("XOOPS root path not defined");
/**
* Get {@link XoopsThemeForm} for adding/editing fields
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* Profile core preloads
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_avatar.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
<{if $old_avatar}>
<div class="pad10 center">
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_changepass.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,3 +1,3 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
-<{includeq file="db:profile_form.html" xoForm=$form}>
+<{includeq file="db:profile_form.tpl" xoForm=$form}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_editprofile.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
<{if $stop}>
@@ -6,4 +6,4 @@
<br class='clear'/>
<{/if}>
-<{includeq file="db:profile_form.html" xoForm=$userinfo}>
+<{includeq file="db:profile_form.tpl" xoForm=$userinfo}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_email.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,3 +1,3 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
-<{includeq file="db:profile_form.html" xoForm=$emailform}>
+<{includeq file="db:profile_form.tpl" xoForm=$emailform}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_register.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
<{if $steps|@count > 1 AND $current_step >= 0}>
<div class='register-steps'>
@@ -30,7 +30,7 @@
<{if $regform}>
<h3><{$regform.title}></h3>
- <{includeq file="db:profile_form.html" xoForm=$regform}>
+ <{includeq file="db:profile_form.tpl" xoForm=$regform}>
<{elseif $finish}>
<h1><{$finish}></h1>
<{if $finish_message}><p><{$finish_message}></p><{/if}>
@@ -42,4 +42,4 @@
<input type='hidden' name="pass" id="pass" value="<{$finish_pass}>">
</form>
<{/if}>
-<{/if}>
\ No newline at end of file
+<{/if}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
<div>( <{$total_users}> )</div>
<{if $users}>
<table>
@@ -21,4 +21,4 @@
<div class="errorMsg">
<{$smarty.const._PROFILE_MA_NOUSERSFOUND}>
</div>
-<{/if}>
\ No newline at end of file
+<{/if}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_search.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,3 +1,3 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
<div>( <{$total_users}> )</div>
-<{includeq file="db:profile_form.html" xoForm=$searchform}>
+<{includeq file="db:profile_form.tpl" xoForm=$searchform}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl 2014-05-05 12:45:22 UTC (rev 12520)
@@ -1,4 +1,4 @@
-<{includeq file="db:profile_breadcrumbs.html"}>
+<{includeq file="db:profile_breadcrumbs.tpl"}>
<div>
<{if $avatar}>
@@ -100,4 +100,4 @@
<{/foreach}>
<!-- end module search results loop -->
</div>
-<{/if}>
\ No newline at end of file
+<{/if}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2014-05-03 14:14:55 UTC (rev 12519)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php 2014-05-05 12:45:22 UTC (rev 12520)
@@ -106,7 +106,7 @@
//disable cache
$GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
}
- $xoopsOption['template_main'] = 'profile_userinfo.html';
+ $xoopsOption['template_main'] = 'profile_userinfo.tpl';
include $GLOBALS['xoops']->path('header.php');
$GLOBALS['xoopsTpl']->assign('user_ownpage', false);
}
|
