Skip to content

一些改进 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
koboshi wants to merge 4 commits into
base: master
Choose a base branch
from
Open

一些改进 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8b63f4
入口文件include类库从相对路径改为绝对路径
koboshi Jan 3, 2014
bda042d
错误信息显示与否现在可通过常量DEBUG控制
koboshi Jan 3, 2014
9e903b2
略微的修改
koboshi Jan 3, 2014
45a0d11
改回if (!defined('IN')) die('bad request');形式
koboshi Jan 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
.DS_Store
INSTALL.txt
LICENSE.txt
README.txt
demos/
extras/documentation
.buildpath
.settings
.settings/
.idea/
/idea
.project
2 changes: 1 addition & 1 deletion _lp/core/controller/core.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

if( !defined('IN') ) die('bad request');
if (!defined('IN')) die('bad request');

@picasso250 picasso250 Jan 5, 2014

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

让原本的代码保持原本的样子，尤其是代码风格。



class coreController
Expand Down
10 changes: 7 additions & 3 deletions _lp/lp.init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

if( !defined('AROOT') ) die('NO AROOT!');

@picasso250 picasso250 Jan 5, 2014

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不要做删掉一个空行这种无意义的事情。这种无意义的diff会扰乱我们的视线。

@4tj 4tj Jan 5, 2014

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...你们好严格

@picasso250 picasso250 Jan 5, 2014

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我并没有merge的权力。实际上，你的代码要通过 @easychen 的认可才能合并。

而且，我和 @easychen 并不认识。

if( !defined('DS') ) define( 'DS' , DIRECTORY_SEPARATOR );

Expand All @@ -9,9 +8,14 @@
define( 'ROOT' , dirname( __FILE__ ) . DS );
define( 'CROOT' , ROOT . 'core' . DS );

// define
// define
error_reporting(E_ALL^E_NOTICE);
ini_set( 'display_errors' , true );
if (defined('DEBUG') && DEBUG) {
ini_set( 'display_errors' , 1 );
}
else {
ini_set( 'display_errors' , 0 );
}

include_once( CROOT . 'lib' . DS . 'core.function.php' );
@include_once( AROOT . 'lib' . DS . 'app.function.php' );
Expand Down
4 changes: 3 additions & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
/**** load lp framework ***/
define( 'DS' , DIRECTORY_SEPARATOR );
define( 'AROOT' , dirname( __FILE__ ) . DS );
define('DEBUG', true);

//ini_set('include_path', dirname( __FILE__ ) . DS .'_lp' );
include_once( '_lp'.DS .'lp.init.php' );
//include_once( '_lp'.DS .'lp.init.php' );

@picasso250 picasso250 Jan 5, 2014

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果你想更改代码，就改。不要注释掉原有的代码。如果你的理由是：为了让别人看清楚之前的代码。那么就更不需要注释，直接删除即可。因为git就是追溯代码的工具。

include AROOT . '_lp'.DS .'lp.init.php';
/**** lp framework init finished ***/