| Index: trunk/extensions/SemanticForms/specials/SF_FormStart.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | if ( !is_null( $super_page ) && $super_page !== '' ) { |
| 69 | 69 | $page_name = "$super_page/$page_name"; |
| 70 | 70 | } |
| 71 | | - |
| | 71 | + |
| 72 | 72 | if ( $page_name !== '' ) { |
| 73 | 73 | // Append the namespace prefix to the page name, |
| 74 | 74 | // if this namespace was not already entered. |
| — | — | @@ -89,7 +89,7 @@ |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | if ( ( !$form_title || !$form_title->exists() ) && ( $form_name !== '' ) ) { |
| 93 | | - $text = Xml::element( 'p', null, wfMsg( 'sf_formstart_badform', SFUtils::linkText( SF_NS_FORM, $form_name ) ) ) . "\n"; |
| | 93 | + $text = Xml::tags( 'p', array( 'class' => 'error' ), wfMsgExt( 'sf_formstart_badform', 'parseinline', SFUtils::linkText( SF_NS_FORM, $form_name ) ) ) . "\n"; |
| 94 | 94 | } else { |
| 95 | 95 | if ( $form_name === '' ) { |
| 96 | 96 | $description = htmlspecialchars( wfMsg( 'sf_formstart_noform_docu', $form_name ) ); |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | else { |
| 99 | 99 | $description = htmlspecialchars( wfMsg( 'sf_formstart_docu', $form_name ) ); |
| 100 | 100 | } |
| 101 | | - |
| | 101 | + |
| 102 | 102 | $text = <<<END |
| 103 | 103 | <form action="" method="post"> |
| 104 | 104 | <p>$description</p> |
| Index: trunk/extensions/SemanticForms/specials/SF_FormEdit.php |
| — | — | @@ -148,7 +148,7 @@ |
| 149 | 149 | . "</div>\n"; |
| 150 | 150 | |
| 151 | 151 | } else { |
| 152 | | - $text = Xml::tags( 'p', array( 'class' => 'error' ), wfMsg( 'sf_formstart_badform', SFUtils::linkText( SF_NS_FORM, $form_name ) ) ) . "\n"; |
| | 152 | + $text = Xml::tags( 'p', array( 'class' => 'error' ), wfMsgExt( 'sf_formstart_badform', 'parseinline', SFUtils::linkText( SF_NS_FORM, $form_name ) ) ) . "\n"; |
| 153 | 153 | } |
| 154 | 154 | } elseif ( $target_name === '' && $page_name_formula === '' ) { |
| 155 | 155 | $text = Xml::element( 'p', array( 'class' => 'error' ), wfMsg( 'sf_formedit_badurl' ) ) . "\n"; |
| Index: trunk/extensions/SemanticForms/specials/SF_RunQuery.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | $text = Xml::element( 'p', array( 'class' => 'error' ), wfMsg( 'sf_runquery_badurl' ) ) . "\n"; |
| 44 | 44 | } else { |
| 45 | 45 | $text = Xml::tags( 'p', array( 'class' => 'error' ), |
| 46 | | - wfMsg( 'sf_formstart_badform', SFUtils::linkText( SF_NS_FORM, $form_name ) ) ) . "\n"; |
| | 46 | + wfMsgExt( 'sf_formstart_badform', 'parseinline', SFUtils::linkText( SF_NS_FORM, $form_name ) ) ) . "\n"; |
| 47 | 47 | } |
| 48 | 48 | $wgOut->addHTML( $text ); |
| 49 | 49 | return; |
| Index: trunk/extensions/SemanticForms/specials/SF_Templates.php |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | $category = $this->getCategoryDefinedByTemplate( $title ); |
| 118 | 118 | if ( $category !== '' ) { |
| 119 | 119 | SFUtils::loadMessages(); |
| 120 | | - $text .= ' ' . wfMsg( 'sf_templates_definescat', SFUtils::linkText( NS_CATEGORY, $category ) ); |
| | 120 | + $text .= ' ' . wfMsgExt( 'sf_templates_definescat', 'parseinline', SFUtils::linkText( NS_CATEGORY, $category ) ); |
| 121 | 121 | } |
| 122 | 122 | return $text; |
| 123 | 123 | } |
| Index: trunk/extensions/SemanticForms/includes/SF_Utils.php |
| — | — | @@ -199,7 +199,7 @@ |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | /** |
| 203 | | - * Creates HTML linking to a wiki page |
| | 203 | + * Creates wiki-text for a link to a wiki page |
| 204 | 204 | */ |
| 205 | 205 | public static function linkText( $namespace, $name, $text = null ) { |
| 206 | 206 | $title = Title::makeTitleSafe( $namespace, $name ); |
| — | — | @@ -207,10 +207,10 @@ |
| 208 | 208 | return $name; // TODO maybe report an error here? |
| 209 | 209 | } |
| 210 | 210 | if ( is_null( $text ) ) { |
| 211 | | - $text = $title->getText(); |
| | 211 | + return '[[:' . $title->getPrefixedText() . '|' . $name . ']]'; |
| | 212 | + } else { |
| | 213 | + return '[[:' . $title->getPrefixedText() . '|' . $text . ']]'; |
| 212 | 214 | } |
| 213 | | - $l = class_exists( 'DummyLinker' ) ? new DummyLinker : new Linker; |
| 214 | | - return $l->makeLinkObj( $title, htmlspecialchars( $text ) ); |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | /** |