|
From: Ivan1986 <iva...@us...> - 2010-10-06 12:04:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".
The branch, master has been updated
via 9628ca3cd173626bae58c3dba5d3711750ef68cc (commit)
via ecde20cbd65f16467960f97182a550cf36c0ea3b (commit)
from 9519e9dc62a721afbe5b902fc62194454542f9fb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9628ca3cd173626bae58c3dba5d3711750ef68cc
Author: Ivan1986 <iva...@li...>
Date: Wed Oct 6 16:03:39 2010 +0400
Исправил siteUrl
diff --git a/QFW/QuickFW/Plugs.php b/QFW/QuickFW/Plugs.php
index 6bbd397..430d860 100644
--- a/QFW/QuickFW/Plugs.php
+++ b/QFW/QuickFW/Plugs.php
@@ -17,7 +17,7 @@ class QuickFW_Plugs
public function baseUrl()
{
- trigger_error('Используйте Url::base()', E_USER_DEPRECATED);
+ trigger_error('Используйте Url::base()', E_USER_NOTICE);
return QFW::$config['redirection']['baseUrl'];
}
@@ -31,7 +31,7 @@ class QuickFW_Plugs
*/
public function siteUrl($url, $get='')
{
- trigger_error('Используйте Url::...', E_USER_DEPRECATED);
+ trigger_error('Используйте Url::...', E_USER_NOTICE);
if (QFW::$config['redirection']['delDef'])
$url = QFW::$router->delDef($url);
if (QFW::$config['redirection']['useRewrite'])
diff --git a/application/default/templates/main.html b/application/default/templates/main.html
index 27a8bb1..6e88a2d 100644
--- a/application/default/templates/main.html
+++ b/application/default/templates/main.html
@@ -3,7 +3,7 @@
<body>
<?php echo $P->outHead('h','1','2'); ?>
Это файл Main.tpl<br />
-Это урл <?php echo $P->siteUrl('test'); ?>
+Это урл <?php echo Url::site('test'); ?>
<br />
<?php echo $content; ?>
commit ecde20cbd65f16467960f97182a550cf36c0ea3b
Author: Ivan1986 <iva...@li...>
Date: Wed Oct 6 16:03:26 2010 +0400
Убрал this
diff --git a/QFW/QuickFW/Router.php b/QFW/QuickFW/Router.php
index 5944058..84e6c78 100644
--- a/QFW/QuickFW/Router.php
+++ b/QFW/QuickFW/Router.php
@@ -154,7 +154,7 @@ class QuickFW_Router
$MCA = $this->loadMCA($data,'Block');
// Если вы все еще сидите на PHP 5.2 то раскомментируйте старый вариант
$MCA['Params'] = empty($patt[4]) ? array() :
- $this->str_getcsv($patt[4],',',"'",'\\'); // parseScobParams($patt[4]);
+ str_getcsv($patt[4],',',"'",'\\'); // $this->parseScobParams($patt[4]);
}
else
{
-----------------------------------------------------------------------
Summary of changes:
QFW/QuickFW/Plugs.php | 4 ++--
QFW/QuickFW/Router.php | 2 +-
application/default/templates/main.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
quickfw
|
