aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-15 10:46:20 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-15 10:46:20 +0000
commit6bb8ac44e5ba0b02e5ee43b5c62e1e42789e739b (patch)
treee2d77bf753057887602360875d846f07297de8b8
parent3191a07d1e5fbd889886150d326101a38e3a3342 (diff)
downloadelgg-6bb8ac44e5ba0b02e5ee43b5c62e1e42789e739b.tar.gz
elgg-6bb8ac44e5ba0b02e5ee43b5c62e1e42789e739b.tar.bz2
Refs #249
git-svn-id: https://code.elgg.org/elgg/trunk@1930 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/pagehandler.php4
-rw-r--r--mod/profile/views/default/profile/listing.php3
-rw-r--r--views/default/admin/statistics_opt/numentities.php3
-rw-r--r--views/default/input/checkboxes.php1
-rw-r--r--views/default/search/entity_list.php5
5 files changed, 12 insertions, 4 deletions
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
index a2bee1bc5..b40726e5a 100644
--- a/engine/lib/pagehandler.php
+++ b/engine/lib/pagehandler.php
@@ -99,7 +99,9 @@
*/
function default_page_handler($page, $handler) {
- global $CONFIG;
+ global $CONFIG;
+ $script = "";
+
$page = implode('/',$page);
if (($questionmark = strripos($page, '?')))
$page = substr($page, 0, $questionmark);
diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php
index 3715222ab..87ccdb5ee 100644
--- a/mod/profile/views/default/profile/listing.php
+++ b/mod/profile/views/default/profile/listing.php
@@ -11,7 +11,8 @@
*
* @uses $vars['entity'] The user entity
*/
-
+ $info = "";
+
//grab the users status message with metadata 'state' set to current if it exists
if($get_status = get_entities_from_metadata("state", "current", "object", "status", $vars['entity']->guid)){
diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php
index fc88a11a5..f0baeb76c 100644
--- a/views/default/admin/statistics_opt/numentities.php
+++ b/views/default/admin/statistics_opt/numentities.php
@@ -12,7 +12,8 @@
// Get entity statistics
- $entity_stats = get_entity_statistics();
+ $entity_stats = get_entity_statistics();
+ $even_odd = "";
?>
<div class="admin_statistics">
<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index f45f37583..ff3ab8523 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -41,6 +41,7 @@
$label = $option;
}
+ $disabled = "";
if ($vars['disabled']) $disabled = ' disabled="yes" ';
echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, null, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
}
diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php
index 7f9018b2f..8ceb0b139 100644
--- a/views/default/search/entity_list.php
+++ b/views/default/search/entity_list.php
@@ -7,7 +7,10 @@
$count = $vars['count'];
$baseurl = $vars['baseurl'];
$context = $vars['context'];
- $viewtype = $vars['viewtype'];
+ $viewtype = $vars['viewtype'];
+
+ $html = "";
+ $nav = "";
if (isset($vars['viewtypetoggle'])) {
$viewtypetoggle = $vars['viewtypetoggle'];