ソースを参照

Avoid E_STRICT errors

pdontthink 17 年 前
コミット
f811dc89ec
1 ファイル変更4 行追加3 行削除
  1. 4 3
      functions/attachment_common.php

+ 4 - 3
functions/attachment_common.php

@@ -248,6 +248,7 @@ function attachment_common_link_vcard(&$Args) {
 function attachment_common_octet_stream(&$Args) {
 function attachment_common_octet_stream(&$Args) {
     global $FileExtensionToMimeType, $null;
     global $FileExtensionToMimeType, $null;
 
 
+//FIXME: I propose removing this hook; I don't like having two hooks close together, but moreover, this hook appears to merely give plugins the chance to add to the global $FileExtensionToMimeType variable, which they can do in any hook before now - I'd recommend prefs_backend (which is what config_override used to be) because it's the one hook run at the beginning of almost all page requests in init.php -- the con is that we don't need it run on ALL page requests, do we?  There may be another hook in THIS page request that we can recommend, in which case, we *really should* remove this hook here.
     do_hook('attachment_common-load_mime_types', $null);
     do_hook('attachment_common-load_mime_types', $null);
 
 
     ereg('\\.([^\\.]+)$', $Args[6], $Regs);
     ereg('\\.([^\\.]+)$', $Args[6], $Regs);
@@ -257,8 +258,8 @@ function attachment_common_octet_stream(&$Args) {
     if ($Ext == '' || ! isset($FileExtensionToMimeType[$Ext]))
     if ($Ext == '' || ! isset($FileExtensionToMimeType[$Ext]))
         return;
         return;
 
 
-    do_hook('attachment ' . $FileExtensionToMimeType[$Ext],
-        $temp=array(&$Args[0], &$Args[1], &$Args[2], &$Args[3], &$Args[4], &$Args[5],
-        &$Args[6], &$Args[7], &$Args[8]));
+    $temp=array(&$Args[0], &$Args[1], &$Args[2], &$Args[3], &$Args[4], &$Args[5],
+                &$Args[6], &$Args[7], &$Args[8]);
+    do_hook('attachment ' . $FileExtensionToMimeType[$Ext], $temp);
 
 
 }
 }