Changeset 1228:ead1a1502e66 for inc/core/class.dc.blog.php

Timestamp:

07/25/13 09:59:44 (12 years ago)

Author:

Franck Paul <carnet.franck.paul@…>

Branch:

2.5

Parents:

1226:14c2f8ad8674 (diff), 1227:8fd3c2ccada5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged in akewea/dotclear/ticket#1404 (pull request #28) : fixes #1404

Files:

• inc/core/class.dc.blog.php (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (1 diff)

inc/core/class.dc.blog.php

@@ -2267 +2267 @@
           
           if ($cur->comment_site !== null && $cur->comment_site != '') {
-               if (!preg_match('|^http(s?)://|',$cur->comment_site)) {
+               if (!preg_match('|^http(s?)://|i',$cur->comment_site, $matches)) {
                     $cur->comment_site = 'http://'.$cur->comment_site;
+               }else{
+                    $cur->comment_site = strtolower($matches[0]).substr($cur->comment_site, strlen($matches[0]));
                }
           }

inc/core/class.dc.blog.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or