Require php-mbstring and php-xml for mediawiki

[chef.git] / cookbooks / mediawiki / providers / extension.rb

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index cb4cc5c84b3670edde1267887c6c4109fc721c0a..e0eefa24509b1da49a1a9145d4e3cfad3ffbbe0c 100644 (file)
--- a/cookbooks/mediawiki/providers/extension.rb
+++ b/cookbooks/mediawiki/providers/extension.rb
@@ -30,14 +30,16 @@ action :create do
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0755
+      mode 0o755
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]
-      files_mode 0755
+      files_mode 0o755
     end
   else
     extension_repository = new_resource.repository || default_repository
-    extension_reference = if new_resource.tag
+    extension_reference = if new_resource.reference
+                            new_resource.reference
+                          elsif new_resource.tag
                             "refs/tags/#{new_resource.tag}"
                           else
                             "REL#{extension_version}".tr(".", "_")
@@ -60,7 +62,7 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0664
+      mode 0o664
       variables new_resource.variables
     end
   else
@@ -68,10 +70,10 @@ action :create do
 
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
       action :create
-      content "<?php require_once('#{extension_script}');\n"
+      content "<?php wfLoadExtension( '#{new_resource.name}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0664
+      mode 0o664
       only_if { ::File.exist?(extension_script) }
     end
   end