r76410 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76409‎ | r76410 | r76411 >
Date:19:54, 9 November 2010
Author:yaron
Status:deferred
Tags:
Comment:
Simplified some syntax, added support for new 'query title=' param in {{{info}}}
Modified paths:
  • /trunk/extensions/SemanticForms/includes/SF_FormPrinter.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
@@ -1077,23 +1077,23 @@
10781078 if ( $tag == 'create title' || $tag == 'add title' ) {
10791079 // handle this only if we're adding a page
10801080 if ( ! $this->mPageTitle->exists() ) {
1081 - $val = $sub_components[1];
1082 - $form_page_title = $val;
 1081+ $form_page_title = $sub_components[1];
10831082 }
1084 - }
1085 - elseif ( $tag == 'edit title' ) {
 1083+ } elseif ( $tag == 'edit title' ) {
10861084 // handle this only if we're editing a page
10871085 if ( $this->mPageTitle->exists() ) {
1088 - $val = $sub_components[1];
1089 - $form_page_title = $val;
 1086+ $form_page_title = $sub_components[1];
10901087 }
1091 - }
1092 - elseif ( $tag == 'partial form' ) {
 1088+ } elseif ( $tag == 'query title' ) {
 1089+ // handle this only if we're in 'RunQuery'
 1090+ if ( $is_query ) {
 1091+ $form_page_title = $sub_components[1];
 1092+ }
 1093+ } elseif ( $tag == 'partial form' ) {
10931094 $form_is_partial = true;
10941095 // replacement pages may have minimal matches...
10951096 $source_page_matches_this_form = true;
1096 - }
1097 - elseif ( $tag == 'includeonly free text' || $tag == 'onlyinclude free text' ) {
 1097+ } elseif ( $tag == 'includeonly free text' || $tag == 'onlyinclude free text' ) {
10981098 $onlyinclude_free_text = true;
10991099 }
11001100 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r76414Merging from r76172 through r76410 of trunkawjrichards21:14, 9 November 2010
r76427Merging from r76410 through r76426 of trunkawjrichards04:03, 10 November 2010

Status & tagging log