public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Romain LE DISEZ 2010-06-03 14:23:40 +02:00
commit 1312bc742f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/example.php
View File

@ -53,8 +53,7 @@ alert("Found: {$photos->data->members[0]}");
alert("Grab a random photo");
$photos = Gallery3::factory($root->url, $auth)
->set("random", "true")
$photos = Gallery3::factory("{$root->url}?random=true", $auth)
->load();
alert("Found: {$photos->data->members[0]}");

17
modules/developer/controllers/admin_developer.php
View File

@ -259,17 +259,20 @@ class Admin_Developer_Controller extends Admin_Controller {
if (preg_match_all('#module::event\("(.*?)"(.*)\);#mU', $file_as_string, $matches, PREG_SET_ORDER) > 0) {
foreach ($matches as $match) {
$event_name = $match[1];
$parameters = array();
if (!empty($match[2]) &&
preg_match_all('#\$[a-zA-Z_]*#', $match[2], $param_names)) {
$display_name = ucwords(str_replace("_", " ", $event_name));
if (!in_array($display_name, self::$event_list)) {
$parameters = array();
if (!empty($match[2]) &&
preg_match_all('#\$[a-zA-Z_]*#', $match[2], $param_names)) {
foreach ($param_names[0] as $name) {
$parameters[] = $name != '$this' ? $name : '$' . $event_name;
foreach ($param_names[0] as $name) {
$parameters[] = $name != '$this' ? $name : '$' . $event_name;
}
}
self::$event_list["static function $event_name(" . implode(", ", $parameters) . ")"] = $display_name;
}
self::$event_list["static function $event_name(" . implode(", ", $parameters) . ")"] = $event_name;
ksort(self::$event_list);
}
ksort(self::$event_list);
}
}
}