diff options
| author | rvelices <rv-github@modusoptimus.com> | 2014-03-11 20:28:25 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2014-03-11 20:28:25 +0000 |
| commit | 3ced01436b5afaf806db66442a2058b3c321d2ec (patch) | |
| tree | 9b6f4b2511dc8af23ab3e5429cecf564ef64a269 | |
| parent | e88ba8d5e943e313359c47cd672e67a8ffc9ac60 (diff) | |
Merged -r27692 from trunk to branch 2.6:
fix preg_replace_callback from -r26972
git-svn-id: http://piwigo.org/svn/branches/2.6@27693 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/history.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/history.php b/admin/history.php index 5c1aa4326..7d52f8087 100644 --- a/admin/history.php +++ b/admin/history.php @@ -403,7 +403,7 @@ SELECT { $tags_string = preg_replace_callback( '/(\d+)/', - create_function('$m', 'return isset($name_of_tag[$m[1]]) ? $name_of_tag[$m[1]] : $m[1];'), + create_function('$m', 'global $name_of_tag; return isset($name_of_tag[$m[1]]) ? $name_of_tag[$m[1]] : $m[1];'), str_replace( ',', ', ', |