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

Show file tree
Hide file tree
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
Next Next commit
Regenerated build/
  • Loading branch information
@sjinks
sjinks committed Feb 23, 2014
commit da77c0ede6e511a50a7eba312399ebd42ee569dd
19,565 changes: 8,763 additions & 10,802 deletions build/32bits/phalcon.c
View file
Open in desktop

Large diffs are not rendered by default.

361 changes: 184 additions & 177 deletions build/32bits/phalcon.h
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 22 additions & 9 deletions build/32bits/php_phalcon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ typedef struct _phalcon_memory_entry {
struct _phalcon_memory_entry *next;
#ifndef PHALCON_RELEASE
const char *func;
zend_bool permanent;
#endif
} phalcon_memory_entry;

Expand Down Expand Up @@ -73,18 +74,23 @@ typedef struct _phalcon_db_options {
zend_bool escape_identifiers;
} phalcon_db_options;

/** DI options */
typedef struct _phalcon_di_options {
zval **injector;
HashTable *shared_services_cache;
zend_bool cache_enabled;
} phalcon_di_options;
/** Security options */
typedef struct _phalcon_security_options {
zend_bool crypt_std_des_supported;
zend_bool crypt_ext_des_supported;
zend_bool crypt_md5_supported;
zend_bool crypt_blowfish_supported;
zend_bool crypt_blowfish_y_supported;
zend_bool crypt_sha256_supported;
zend_bool crypt_sha512_supported;
} phalcon_security_options;

ZEND_BEGIN_MODULE_GLOBALS(phalcon)

/** Memory */
phalcon_memory_entry *start_memory;
phalcon_memory_entry *active_memory;
phalcon_memory_entry *start_memory; /**< The first preallocated frame */
phalcon_memory_entry *end_memory; /**< The last preallocate frame */
phalcon_memory_entry *active_memory; /**< The current memory frame */

/** Virtual Symbol Tables */
phalcon_symbol_table *active_symbol_table;
Expand All @@ -97,7 +103,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phalcon)
zval *z_one;

/** Function cache */
HashTable *function_cache;
HashTable *fcache;

/** ORM */
phalcon_orm_options orm;
Expand All @@ -107,6 +113,9 @@ ZEND_BEGIN_MODULE_GLOBALS(phalcon)

zend_bool register_psr3_classes;

/** Security */
phalcon_security_options security;

/** DB */
phalcon_db_options db;

Expand Down Expand Up @@ -146,6 +155,10 @@ extern int nusphere_dbg_present;
Z_TYPE_P(z) = Z_TYPE_P(v);
#endif

#ifndef HASH_KEY_NON_EXISTENT
# define HASH_KEY_NON_EXISTENT HASH_KEY_NON_EXISTANT
#endif


#define PHALCON_INIT_CLASS(name) \
int phalcon_ ##name## _init(TSRMLS_D)
Expand Down
Loading