Changeset 601

Timestamp:

2009-07-05T07:39:17+02:00 (4 years ago)

Author:

moo

Message:

merged r356,r359,r360 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• admin/common-zh-simplified-utf-8.lang.php (modified) (1 diff)
• admin/common-zh-traditional-utf-8.lang.php (modified) (1 diff)
• admin/xcache.tpl.php (modified) (2 diffs)
• xcache.c (modified) (1 diff)

branches/1.3/admin/common-zh-simplified-utf-8.lang.php

@@ -59 +59 @@
         'inode'
         => 'Inode',
+        'hash'
+        => 'Hash',
         'Access'
         => '访问',

branches/1.3/admin/common-zh-traditional-utf-8.lang.php

@@ -59 +59 @@
         'inode'
         => 'Inode',
+        'hash'
+        => 'Hash',
         'Access'
         => '存取',

branches/1.3/admin/xcache.tpl.php

@@ -170 +170 @@
             <?php } ?>
             <?php } ?>
+            <th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('hash'); ?></a></th>
             <th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Access'); ?></a></th>
             <th><a href="javascript:" onclick="resort(this); return false"><?php echo _T('Create'); ?></a></th>
@@ -228 +229 @@
             }
             echo <<<ENTRY
+            <td int="{$entry['hvalue']}">{$entry['hvalue']}</td>
             <td int="{$entry['atime']}">{$atime}</td>
             <td int="{$entry['ctime']}">{$ctime}</td>

branches/1.3/xcache.c

@@ -451 +451 @@
     add_assoc_long_ex(ei, ZEND_STRS("ctime"),    entry->ctime);
     add_assoc_long_ex(ei, ZEND_STRS("atime"),    entry->atime);
+    add_assoc_long_ex(ei, ZEND_STRS("hvalue"),   entry->hvalue);
     if (del) {
         add_assoc_long_ex(ei, ZEND_STRS("dtime"), entry->dtime);