-
Notifications
You must be signed in to change notification settings - Fork 790
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.
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
Fix issue 364, 366, 368, 369 #370
Conversation
changes September 19th 2013
Formulation/spelling fixes
Update nl.php
added GitTip donation link
added GitTip donation link
Add a Bitdeli Badge to README
added changelog
removed CAPTCHA_FONT_PATH as it is not used anymore
added composer project creation command
added composer project creation command
changelog update
- issue: 366 - problem: warnings display because method parameters where not passed to function (vars not set) - changes: 1. Check number of required parameters on the method before calling it.(used reflectionmethod PHP 5 >= 5.0.3) if number of available parameters is smaller then required script headers to error/index 2. Added die after header, otherwise script execution will continue (can lead to nesty bug)
# Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch develop # Your branch is up-to-date with 'origin/develop'. # # Changes to be committed: # new file: .idea/inspectionProfiles/Project_Default.xml # new file: .idea/inspectionProfiles/profiles_settings.xml # modified: application/libs/Application.php # # Changes not staged for commit: # modified: .htaccess # modified: .idea/inspectionProfiles/Project_Default.xml # modified: application/config/config.php # modified: composer.json # # Untracked files: # .idea/.name # .idea/encodings.xml # .idea/misc.xml # .idea/modules.xml # .idea/phplogin.iml # .idea/scopes/ # .idea/vcs.xml # .idea/workspace.xml # composer.lock # vendor/ #
# Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch develop # Your branch is up-to-date with 'origin/develop'. # # Changes to be committed: # new file: .idea/inspectionProfiles/Project_Default.xml # new file: .idea/inspectionProfiles/profiles_settings.xml # modified: application/libs/Application.php # # Changes not staged for commit: # modified: .htaccess # modified: .idea/inspectionProfiles/Project_Default.xml # modified: application/config/config.php # modified: composer.json # # Untracked files: # .idea/.name # .idea/encodings.xml # .idea/misc.xml # .idea/modules.xml # .idea/phplogin.iml # .idea/scopes/ # .idea/vcs.xml # .idea/workspace.xml # composer.lock # vendor/ #
Added COOKIE_DOMIAN to destroy cookie methods
I would like to merge parts of your commit, but not merging the ``die()` stuff. That's a little bit difficult now, because you've committed all fixed with one commit. I'm too stupid to figure out how to merge only single commits ("cherry-picking" afaik), github allows only full merge or no merge. Does anybody know how to do this properly ? |
@@ -4,8 +4,7 @@ | |||
* Class Application | |||
* The heart of the app | |||
*/ | |||
class Application | |||
{ | |||
class Application { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not PSR-2. PSR-2 says braces opening a new class must be on a new line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@@ -68,6 +69,7 @@ public function __construct() | |||
} else { | |||
// redirect user to error page (there's a controller for that) | |||
header('location: ' . URL . 'error/index'); | |||
die(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:( Maybe better to return;
@panique Is there anything I can change on this pull request so you accept it? |
@thierryve This is a difficult situation, as your commits are partly very useful, but there's also code that cannot go into the project (yet), like the die(). Beside, the project is currently in beta and should only introduce fixes, not additional logic. I hope you are not angry if I reject these commits this time !? :( It's better for project cleanness to do so. It's not possible to merge only parts with GitHub in a clean way. When there's time I'll try to cherry-pick parts of your work. Thanks! |
if number of available parameters is smaller then required script headers to error/index
http:https://stackoverflow.com/questions/8665985/php-utilizing-exit-or-die-after-headerlocation