Yoselyn.lp1

Sorry this is the pull request for the bug 5855, php notice will be later fixed