Skip to content
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

Replace placeholders even if the string is not in the language content #2080

Merged
merged 10 commits into from Feb 23, 2014
Merged

Replace placeholders even if the string is not in the language content #2080

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c5e509b
Clean up #include
sjinks Feb 23, 2014
a16fce1
Replace placeholders even if the string is not in the language content
sjinks Feb 23, 2014
5c8700d
Test case for #2044
sjinks Feb 23, 2014
18456b4
Updated CHANGELOG
sjinks Feb 23, 2014
5bcc6b9
Bug fixes
sjinks Feb 23, 2014
676b270
Fix build generator
sjinks Feb 23, 2014
da77c0e
Regenerated build/
sjinks Feb 23, 2014
ed85a95
Bug fixes for clang
sjinks Feb 23, 2014
e61500f
Regenerated build/
sjinks Feb 23, 2014
5e1aca0
Cosmetic code fix
sjinks Feb 23, 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
Prev Previous commit
Cosmetic code fix
  • Loading branch information
@sjinks
sjinks committed Feb 23, 2014
commit 5e1aca09833d69194141c4cef3401c73f7370b9d
6 changes: 3 additions & 3 deletions ext/kernel/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ void phalcon_copy_ctor(zval *destiny, zval *origin) PHALCON_ATTR_NONNULL;
do { \
zval **tmp_ = (ppzv); \
if (tmp_ != NULL) { \
if (*tmp_) { \
zval_ptr_dtor(tmp_); \
*tmp_ = NULL; \
if (*tmp_) { \
zval_ptr_dtor(tmp_); \
*tmp_ = NULL; \
} \
else { \
phalcon_memory_observe((ppzv) TSRMLS_CC); \
Expand Down