Merge branch 'develop' of projects.ceondo.com:indefero

INSTALL.mdtext

@@ -213,3 +213,13 @@ may have problems as your certificate is not trusted, check the
 [procedure provided here][svnfix] to solve the problem.
 
 [svnfix]: http://projects.ceondo.com/p/indefero/issues/319/#ic1358
+
+## If the registration links are not working
+
+If You have standard instalaction of PHP ie in Debian, php.ini sets
+mbstring.func_overload to value "2" for overloading str*
+functions. You need to prevent the overload as it does not make sense
+anyway (magic in the background is bad!). 
+See the [corresponding ticket][reglink].
+
+[reglink]: http://projects.ceondo.com/p/indefero/issues/481/

src/IDF/Template/Markdown.php

@@ -46,25 +46,32 @@ class IDF_Template_Markdown extends Pluf_Template_Tag
                                           array($this, 'callbackEmbeddedDoc'), 
                                           $text);
         }
+        // Replace [Page]([[PageName]]) with corresponding link to the page, with link text being Page.
+        $text = preg_replace_callback('#\[([^\]]+)\]\(\[\[([A-Za-z0-9\-]+)\]\]\)#im',
+                                      array($this, 'callbackWikiPage'),
+                                      $text);
         // Replace [[PageName]] with corresponding link to the page.
         $text = preg_replace_callback('#\[\[([A-Za-z0-9\-]+)\]\]#im',
-                                      array($this, 'callbackWikiPage'), 
+                                      array($this, 'callbackWikiPageNoName'),
                                       $text);
         $filter = new IDF_Template_MarkdownPrefilter();
         echo $filter->go(Pluf_Text_MarkDown_parse($text));
     }
 
+    function callbackWikiPageNoName($m)
+    {
+        $m[2] = $m[1]; //Set the link text to be the same as the page name.
+        return $this->callbackWikiPage($m);
+    }
+
     function callbackWikiPage($m)
     {
         $sql = new Pluf_SQL('project=%s AND title=%s', 
-                            array($this->project->id, $m[1]));
+                            array($this->project->id, $m[2]));
         $pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));
-        if ($pages->count() != 1 and !$this->request->rights['hasWikiAccess']) {
-            return $m[0];
-        }
         if ($pages->count() != 1 and $this->request->rights['hasWikiAccess']
             and !$this->request->user->isAnonymous()) {
-            return '<img style="vertical-align: text-bottom;" alt=" " src="'.Pluf::f('url_media').'/idf/img/add.png" /><a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Wiki::create', array($this->project->shortname), array('name'=>$m[1])).'" title="'.__('Create this documentation page').'">'.$m[1].'</a>';
+            return '<img style="vertical-align: text-bottom;" alt=" " src="'.Pluf::f('url_media').'/idf/img/add.png" /><a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Wiki::create', array($this->project->shortname), array('name'=>$m[2])).'" title="'.__('Create this documentation page').'">'.$m[1].'</a>';
         }
         if (!$this->request->rights['hasWikiAccess'] or $pages->count() == 0) {
             return $m[1];

src/IDF/locale/cs/idf.po

@@ -970,7 +970,7 @@ msgid ""
 "<ul>\n"
 "<li>A commit or revision of the current code in the repository from which you started your work.</li>\n"
 "<li>A patch describing your changes with respect to the reference commit.</li>\n"
-"<li><strong>Check your patch to not provide any password or confidential information!</strong></li>\n"
+"<li><strong>Ensure your patch does not contain any passwords or confidential information!</strong></li>\n"
 "</ul>"
 msgstr ""
 

src/IDF/locale/de/idf.po

@@ -970,7 +970,7 @@ msgid ""
 "<ul>\n"
 "<li>A commit or revision of the current code in the repository from which you started your work.</li>\n"
 "<li>A patch describing your changes with respect to the reference commit.</li>\n"
-"<li><strong>Check your patch to not provide any password or confidential information!</strong></li>\n"
+"<li><strong>Ensure your patch does not contain any passwords or confidential information!</strong></li>\n"
 "</ul>"
 msgstr ""
 

src/IDF/locale/fr/idf.po

@@ -1026,7 +1026,7 @@ msgid ""
 "<ul>\n"
 "<li>A commit or revision of the current code in the repository from which you started your work.</li>\n"
 "<li>A patch describing your changes with respect to the reference commit.</li>\n"
-"<li><strong>Check your patch to not provide any password or confidential information!</strong></li>\n"
+"<li><strong>Ensure your patch does not contain any passwords or confidential information!</strong></li>\n"
 "</ul>"
 msgstr ""
 "<p>Pour démarrer une revue de code vous devez fournir :</p>\n"

src/IDF/locale/ru/idf.po

@@ -1019,7 +1019,7 @@ msgid ""
 "<ul>\n"
 "<li>A commit or revision of the current code in the repository from which you started your work.</li>\n"
 "<li>A patch describing your changes with respect to the reference commit.</li>\n"
-"<li><strong>Check your patch to not provide any password or confidential information!</strong></li>\n"
+"<li><strong>Ensure your patch does not contain any passwords or confidential information!</strong></li>\n"
 "</ul>"
 msgstr ""
 

src/IDF/locale/sl/idf.po

@@ -997,7 +997,7 @@ msgid ""
 "<ul>\n"
 "<li>A commit or revision of the current code in the repository from which you started your work.</li>\n"
 "<li>A patch describing your changes with respect to the reference commit.</li>\n"
-"<li><strong>Check your patch to not provide any password or confidential information!</strong></li>\n"
+"<li><strong>Ensure your patch does not contain any passwords or confidential information!</strong></li>\n"
 "</ul>"
 msgstr ""
 

src/IDF/templates/idf/review/create.html

@@ -57,7 +57,7 @@
 <ul>
 <li>A commit or revision of the current code in the repository from which you started your work.</li>
 <li>A patch describing your changes with respect to the reference commit.</li>
-<li><strong>Check your patch to not provide any password or confidential information!</strong></li>
+<li><strong>Ensure your patch does not contain any passwords or confidential information!</strong></li>
 </ul>{/blocktrans}
 </div>
 {/block}