Compare commits

..
Author SHA1 Message Date
bachy 184a808558 update
Signed-off-by: bachy <git@g-u-i.net>
2013-02-10 22:18:51 +01:00
bachy 63465d9076 bug fix : error message
Signed-off-by: bachy <git@g-u-i.net>
2013-02-10 22:17:21 +01:00
5 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -372,7 +372,7 @@ class views_handler_field extends views_handler {
* Optional name of the field where the value is stored.
*/
function get_value($values, $field = NULL) {
$alias = isset($field) ? $this->aliases[$field] : $this->field_alias;
$alias = isset($field) && isset($this->aliases[$field]) ? $this->aliases[$field] : $this->field_alias;
if (isset($values->{$alias})) {
return $values->{$alias};
}
+2 -2
View File
@@ -91,10 +91,10 @@ function views_ui_check_advanced_help() {
$filename = db_query_range("SELECT filename FROM {system} WHERE type = 'module' AND name = 'advanced_help'", 0, 1)
->fetchField();
if ($filename && file_exists($filename)) {
drupal_set_message(t('If you <a href="@modules">enable the advanced help module</a>, Views will provide more and better help. <a href="@hide">Hide this message.</a>', array('@modules' => url('admin/modules'),'@hide' => url('admin/structure/views/settings'))));
drupal_set_message(t('If you <a href="@modules">enable the advanced help module</a>, Views will provide more and better help. <a href="@hide">You can disable this message at the Views settings page.</a>', array('@modules' => url('admin/modules'),'@hide' => url('admin/structure/views/settings'))));
}
else {
drupal_set_message(t('If you install the advanced help module from !href, Views will provide more and better help. <a href="@hide">Hide this message.</a>', array('!href' => l('http://drupal.org/project/advanced_help', 'http://drupal.org/project/advanced_help'), '@hide' => url('admin/structure/views/settings'))));
drupal_set_message(t('If you install the advanced help module from !href, Views will provide more and better help. <a href="@hide">You can disable this message at the Views settings page.</a>', array('!href' => l('http://drupal.org/project/advanced_help', 'http://drupal.org/project/advanced_help'), '@hide' => url('admin/structure/views/settings'))));
}
}
}
+3 -3
View File
@@ -5,9 +5,9 @@ core = 7.x
dependencies[] = views
hidden = TRUE
; Information added by drupal.org packaging script on 2013-01-06
version = "7.x-3.5+37-dev"
; Information added by drupal.org packaging script on 2013-02-04
version = "7.x-3.5+38-dev"
core = "7.x"
project = "views"
datestamp = "1357481879"
datestamp = "1359942791"
+3 -3
View File
@@ -312,9 +312,9 @@ files[] = tests/views_cache.test
files[] = tests/views_view.test
files[] = tests/views_ui.test
; Information added by drupal.org packaging script on 2013-01-06
version = "7.x-3.5+37-dev"
; Information added by drupal.org packaging script on 2013-02-04
version = "7.x-3.5+38-dev"
core = "7.x"
project = "views"
datestamp = "1357481879"
datestamp = "1359942791"
+3 -3
View File
@@ -7,9 +7,9 @@ dependencies[] = views
files[] = views_ui.module
files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php
; Information added by drupal.org packaging script on 2013-01-06
version = "7.x-3.5+37-dev"
; Information added by drupal.org packaging script on 2013-02-04
version = "7.x-3.5+38-dev"
core = "7.x"
project = "views"
datestamp = "1357481879"
datestamp = "1359942791"