search

feulf / raintpl3

The easiest Template Engine for PHP
https://feulf.github.io/raintpl
258 stars 57 forks source link

Config cleanup #111

Closed xPaw closed 11 years ago

xPaw commented 11 years ago

RainTPL is mixing conf/config variables, which is useless, and objectConf is completely unused.

This also fixes #94, #99.

feulf commented 11 years ago

You need to merge origin master into this branch, and there are just a few things to fix, after those I'll merge your pull request. Thanks.

xPaw commented 11 years ago

You need to merge origin master into this branch

It's weird, because I did merge it before doing my changes.

feulf commented 11 years ago

the HEAD sometimes goes out of sync, to make sure you've the latest origin master: git checkout master && git fetch && git pull origin master then you go back on your branch and you do git merge master

xPaw commented 11 years ago

the HEAD sometimes goes out of sync, to make sure you've the latest origin master

It's already up-to-date.

feulf commented 11 years ago

weird, anyway I'll take care of the conflicts in case of any, but first we need to address the comments

feulf commented 11 years ago

I'm closing this, we cannot merge this changes because we need $this->conf. Thanks!