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 eac6bd72843cc724df6e90660fe0f1c1660894ec (commit)
from 3ca3ae2f392a0d1a39c6d192a7e0548640ebc1af (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 eac6bd72843cc724df6e90660fe0f1c1660894ec
Author: Ivan1986 <iva...@li...>
Date: Mon Oct 4 13:42:21 2010 +0400
Убрана ненужная переменная DONE
diff --git a/QFW/QuickFW/Router.php b/QFW/QuickFW/Router.php
index 7f7821e..7865a9f 100644
--- a/QFW/QuickFW/Router.php
+++ b/QFW/QuickFW/Router.php
@@ -219,7 +219,6 @@ class QuickFW_Router
*/
public function show404()
{
- $GLOBALS['DONE'] = 1;
//php_sapi_name если через nginx, то Status
//а надо ли? - nginx и так понимает
/*if (substr(PHP_SAPI, 0, 3) == 'cgi')
@@ -568,7 +567,6 @@ SREG;
if ($l>0 && strpos($uri,QFW::$config['redirection']['defExt'],$l)!==false)
$uri = substr($uri,0,$l);
}
-
return trim($uri, self::PATH_SEPARATOR.'/');
}
diff --git a/www/index.php b/www/index.php
index 8819f84..bc7bd62 100644
--- a/www/index.php
+++ b/www/index.php
@@ -7,11 +7,8 @@
define ('LIBPATH', ROOTPATH . '/lib');
define ('MODPATH', APPPATH . '/_common/models');
- $DONE = 0;
-
require (QFWPATH.'/Init.php');
QFW::$router->route();
-
- $DONE = 1;
+
?>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
QFW/QuickFW/Router.php | 2 --
www/index.php | 5 +----
2 files changed, 1 insertions(+), 6 deletions(-)
hooks/post-receive
--
quickfw
|