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

Fix #2002 Tag::linkTo() to allow the addition of query string parameters #2054

Closed
wants to merge 5 commits into from
Closed

Fix #2002 Tag::linkTo() to allow the addition of query string parameters #2054

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f561a88
FIX #2002 Tag::linkTo() to allow the addition of query string parameters
dreamsxin Feb 18, 2014
e5203d8
Updated TagTest.php
dreamsxin Feb 18, 2014
40f425c
FIX #2002 Tag::linkTo() to allow the addition of query string parameters
dreamsxin Feb 18, 2014
0075fcc
Updated
dreamsxin Feb 19, 2014
077d1da
Updated
Myleft Feb 25, 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
Next Next commit
FIX #2002 Tag::linkTo() to allow the addition of query string parameters
  • Loading branch information
@dreamsxin
dreamsxin committed Feb 18, 2014
commit f561a88f997e1789e506169348963bf81fbd62cc
32 changes: 31 additions & 1 deletion ext/tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ PHP_METHOD(Phalcon_Tag, resetInput){
*/
PHP_METHOD(Phalcon_Tag, linkTo){

zval *parameters, *text = NULL, *local = NULL, *params = NULL, *action, *url, *internal_url, *link_text, *z_local;
zval *parameters, *text = NULL, *local = NULL, *params = NULL, *action, *url, *internal_url, *query, *query_string, *link_text, *z_local;
zval *code;

PHALCON_MM_GROW();
Expand Down Expand Up @@ -777,14 +777,44 @@ PHP_METHOD(Phalcon_Tag, linkTo){
ZVAL_TRUE(z_local);
}

if (phalcon_array_isset_string_fetch(&query, params, SS("query"))) {
phalcon_array_unset_string(&params, SS("query"), 0);

PHALCON_INIT_VAR(query_string);
phalcon_http_build_query(query_string, *query, "&" TSRMLS_CC);
}
else {
PHALCON_INIT_VAR(query_string);
ZVAL_EMPTY_STRING(query_string);
}

if (zend_is_true(z_local) || Z_TYPE_P(params) == IS_ARRAY) {
PHALCON_OBS_VAR(url);
PHALCON_CALL_SELF(&url, "geturlservice");

PHALCON_INIT_VAR(internal_url);
phalcon_call_method_p1(internal_url, url, "get", action);

if (Z_TYPE_P(query_string) == IS_STRING && Z_STRLEN_P(query_string)) {
if (phalcon_memnstr_str(internal_url, "?", 1)) {
PHALCON_SCONCAT_SV(internal_url, "&", query_string);
}
else {
PHALCON_SCONCAT_SV(internal_url, "?", query_string);
}
}

phalcon_array_update_string(&params, SL("href"), internal_url, PH_COPY);
} else {
if (Z_TYPE_P(query_string) == IS_STRING && Z_STRLEN_P(query_string)) {
if (phalcon_memnstr_str(action, "?", 1)) {
PHALCON_SCONCAT_SV(action, "&", query_string);
}
else {
PHALCON_SCONCAT_SV(action, "?", query_string);
}
}

phalcon_array_update_string(&params, SL("href"), action, PH_COPY);
}

Expand Down