[xoops-svn] SF.net SVN: xoops-svn:[11918] XoopsModules/xoopspoll/branches/zyspec

[<be...@us...>]

Revision: 11918
          http://sourceforge.net/p/xoops/svn/11918
Author:   beckmi
Date:     2013-08-14 11:33:08 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Fixing preg_replace /e for PHP 5.5.x

Modified Paths:
--------------
    XoopsModules/xoopspoll/branches/zyspec/class/request.php
    XoopsModules/xoopspoll/branches/zyspec/xoops_version.php

Modified: XoopsModules/xoopspoll/branches/zyspec/class/request.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/class/request.php	2013-08-14 10:29:47 UTC (rev 11917)
+++ XoopsModules/xoopspoll/branches/zyspec/class/request.php	2013-08-14 11:33:08 UTC (rev 11918)
@@ -932,9 +932,14 @@
         }
         $source = strtr($source, $ttr);
         // convert decimal
-        $source = preg_replace('/&#(\d+);/me', "chr(\\1)", $source); // decimal notation
+//        $source = preg_replace('/&#(\d+);/me', "chr(\\1)", $source); // decimal notation
+        $source = preg_replace_callback('/&#(\d+);/m', create_function('$matches',"return  chr(\$matches[1]);"),$source);
+
+
         // convert hex
-        $source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
+//        $source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
+        $source = preg_replace_callback('/&#x([a-f0-9]+);/mi', create_function('$matches',"return  chr('0x'.\$matches[1]);"),$source);
+
         return $source;
     }
 }
\ No newline at end of file

Modified: XoopsModules/xoopspoll/branches/zyspec/xoops_version.php
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/xoops_version.php	2013-08-14 10:29:47 UTC (rev 11917)
+++ XoopsModules/xoopspoll/branches/zyspec/xoops_version.php	2013-08-14 11:33:08 UTC (rev 11918)
@@ -51,7 +51,7 @@
 $modversion['official']       = 1; // 0 = 3rd party module, 1 = supported by XOOPS Community
 $modversion['image']          = 'images'
                               . DIRECTORY_SEPARATOR . 'xoopspoll_slogo.png';
-$modversion['dirname']        = 'xoopspoll';
+$modversion['dirname']        = basename(dirname(__FILE__));
 $modversion['dirmoduleadmin'] = 'Frameworks'
                               . DIRECTORY_SEPARATOR . 'moduleclasses'
                               . DIRECTORY_SEPARATOR . 'moduleadmin';