Changeset 2252

Timestamp:

05/21/10 14:52:30 (14 years ago)

Author:

bruno

Message:

TimeAgo? v1.2 : removed php 5.3 -specific code. Should now work with older versions of PHP

Location:

plugins/timeago

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (2 diffs)

plugins/timeago/_define.php

@@ -18 +18 @@
      /* Description*/         "Adds twitter-like dates for posts and comments, such as '3 hours ago'",
      /* Author */             "Bruno Hondelatte",
-     /* Version */            "1.1",
+     /* Version */            "1.2",
      /* Permissions */        null
 );

plugins/timeago/_public.php

@@ -63 +63 @@
           
           $plur = ($delta==1)?'':'s';
-          $res = sprintf($l10n[$unit.$plur],$delta);
+          if (isset($l10n[$unit.$plur])) {
+               $res = sprintf($l10n[$unit.$plur],$delta);
+          } else {
+               $res = sprintf(TimeAgoTpl::$l10n[$unit.$plur],$delta);
+          }
           if ($cap)
                $res = ucfirst($res);
@@ -72 +76 @@
 
           // Parse l10n attributes, if specified
-          $inter = array_intersect_key($attr->getArrayCopy(),TimeAgoTpl::$l10n);
-          if (sizeof($inter)==0) {
+          $l10n = array();
+          foreach(TimeAgoTpl::$l10n as $k=>$v) {
+               if (isset($attr[$k]))
+                    $l10n[$k]=$attr[$k];
+          }
+          if (sizeof($l10n)==0) {
                $l10nArgs = '';
           } else {
-               $l10n = array_replace(TimeAgoTpl::$l10n,$inter);
                array_walk($l10n,create_function('&$v, $k', '$v = addslashes($v);'));
                $args = array();