Changeset 930:b4df0564a93c

Timestamp:

10/29/12 10:10:18 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add capitalize attribute to template filters' list, fixes #920

Location:

inc/public

Files:

• class.dc.template.php (modified) (2 diffs)
• lib.tpl.context.php (modified) (2 diffs)

inc/public/class.dc.template.php

@@ -392 +392 @@
           $p[2] = '0';   # cut_string
           $p[3] = '0';   # lower_case
-          $p[4] = '0';   # upper_case
+          $p[4] = '0';   # upper_case or capitalize
           
           $p[0] = (integer) (!empty($attr['encode_xml']) || !empty($attr['encode_html']));
@@ -403 +403 @@
           $p[3] = (integer) !empty($attr['lower_case']);
           $p[4] = (integer) !empty($attr['upper_case']);
+          $p[4] = (!empty($attr['capitalize']) ? 2 : $p[4]);
           
           return "context::global_filter(%s,".implode(",",$p).",'".addslashes($this->current_tag)."')";

inc/public/lib.tpl.context.php

@@ -127 +127 @@
                $str = self::lower_case($str);
           } elseif ($upper_case) {
-               $str = self::upper_case($str);
+               if ($upper_case == 2) {
+                    $str = self::capitalize($str);
+               } else {
+                    $str = self::upper_case($str);
+               }
           }
           
@@ -160 +164 @@
      {
           return mb_strtoupper($str);
+     }
+
+     public static function capitalize($str)
+     {
+          if ($str != '') {
+             $str[0] = mb_strtoupper($str[0]);
+          }
+          return $str;
      }