@@ -240,7 +240,7 @@ |
||
| 240 | 240 | catch (midcom_error $e) |
| 241 | 241 | { |
| 242 | 242 | debug_add("Could not get target for symlinked topic #{$topic->id}: " . |
| 243 | - $e->getMessage(), MIDCOM_LOG_ERROR); |
|
| 243 | + $e->getMessage(), MIDCOM_LOG_ERROR); |
|
| 244 | 244 | } |
| 245 | 245 | midcom::get()->auth->drop_sudo(); |
| 246 | 246 | } |
@@ -136,4 +136,4 @@ |
||
| 136 | 136 | throw new midcom_error("Cannot execute {$this->config['midcom_services_rcs_bin_dir']}/ci."); |
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | - } |
|
| 139 | + } |
|
@@ -125,12 +125,12 @@ discard block |
||
| 125 | 125 | return $status; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - /** |
|
| 129 | - * Get the object of a revision |
|
| 130 | - * |
|
| 131 | - * @param string revision identifier of revision wanted |
|
| 132 | - * @return array array representation of the object |
|
| 133 | - */ |
|
| 128 | + /** |
|
| 129 | + * Get the object of a revision |
|
| 130 | + * |
|
| 131 | + * @param string revision identifier of revision wanted |
|
| 132 | + * @return array array representation of the object |
|
| 133 | + */ |
|
| 134 | 134 | public function get_revision($revision) |
| 135 | 135 | { |
| 136 | 136 | if (empty($this->_guid)) |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | && substr($lines[$i], 0, 4) != '----' |
| 368 | 368 | && substr($lines[$i], 0, 5) != '=====') |
| 369 | 369 | { |
| 370 | - $i++; |
|
| 370 | + $i++; |
|
| 371 | 371 | } |
| 372 | 372 | } |
| 373 | 373 | } |
@@ -312,17 +312,17 @@ |
||
| 312 | 312 | private static $_privileges_cache = array(); |
| 313 | 313 | |
| 314 | 314 | /** |
| 315 | - * Internal cache of the content privileges of users on content objects, this is |
|
| 316 | - * an associative array using a combination of the user identifier and the object's |
|
| 317 | - * guid as index. The privileges for the anonymous user use the magic |
|
| 318 | - * EVERYONE as user identifier. |
|
| 319 | - * |
|
| 320 | - * This must not be merged with the class-wide privileges_cache, because otherwise |
|
| 321 | - * class_default_privileges for child objects might be overridden by parent default |
|
| 322 | - * privileges |
|
| 323 | - * |
|
| 324 | - * @var Array |
|
| 325 | - */ |
|
| 315 | + * Internal cache of the content privileges of users on content objects, this is |
|
| 316 | + * an associative array using a combination of the user identifier and the object's |
|
| 317 | + * guid as index. The privileges for the anonymous user use the magic |
|
| 318 | + * EVERYONE as user identifier. |
|
| 319 | + * |
|
| 320 | + * This must not be merged with the class-wide privileges_cache, because otherwise |
|
| 321 | + * class_default_privileges for child objects might be overridden by parent default |
|
| 322 | + * privileges |
|
| 323 | + * |
|
| 324 | + * @var Array |
|
| 325 | + */ |
|
| 326 | 326 | private static $_content_privileges_cache = array(); |
| 327 | 327 | |
| 328 | 328 | /** |
@@ -474,7 +474,7 @@ |
||
| 474 | 474 | { |
| 475 | 475 | return |
| 476 | 476 | ( |
| 477 | - $this->string_exists($string, $this->_language) |
|
| 477 | + $this->string_exists($string, $this->_language) |
|
| 478 | 478 | || $this->string_exists($string, $this->_fallback_language) |
| 479 | 479 | ); |
| 480 | 480 | } |
@@ -161,12 +161,12 @@ |
||
| 161 | 161 | */ |
| 162 | 162 | public function bind_data() |
| 163 | 163 | { |
| 164 | - $this->_check_object(); |
|
| 164 | + $this->_check_object(); |
|
| 165 | 165 | |
| 166 | - foreach ($this->_request['params'] as $field => $value) |
|
| 167 | - { |
|
| 168 | - $this->_object->{$field} = $value; |
|
| 169 | - } |
|
| 166 | + foreach ($this->_request['params'] as $field => $value) |
|
| 167 | + { |
|
| 168 | + $this->_object->{$field} = $value; |
|
| 169 | + } |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | /** |
@@ -139,7 +139,7 @@ |
||
| 139 | 139 | else |
| 140 | 140 | { |
| 141 | 141 | $this->add('Setting: upload_max_filesize', |
| 142 | - self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})"); |
|
| 142 | + self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})"); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | $post_limit = $this->ini_get_filesize('post_max_size'); |
@@ -412,13 +412,13 @@ discard block |
||
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | if ( (empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"]) |
| 415 | - // Some items may want to keep their links unmutilated |
|
| 415 | + // Some items may want to keep their links unmutilated |
|
| 416 | 416 | || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink") |
| 417 | 417 | && substr($item[MIDCOM_TOOLBAR_URL], 0, 1) != '/' |
| 418 | 418 | && !preg_match('|^https?://|', $item[MIDCOM_TOOLBAR_URL])) |
| 419 | 419 | { |
| 420 | 420 | $item[MIDCOM_TOOLBAR_URL] = |
| 421 | - midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) |
|
| 421 | + midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) |
|
| 422 | 422 | . $item[MIDCOM_TOOLBAR_URL]; |
| 423 | 423 | } |
| 424 | 424 | return $item; |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | { |
| 581 | 581 | debug_add("toolbar:update_item_url: We have a relative URL, transforming it..."); |
| 582 | 582 | $this->items[$index][MIDCOM_TOOLBAR_URL] = |
| 583 | - midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) |
|
| 583 | + midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) |
|
| 584 | 584 | . $url; |
| 585 | 585 | } |
| 586 | 586 | else |
@@ -58,7 +58,6 @@ |
||
| 58 | 58 | * @property string $revisor The person that modified the object, read-only. |
| 59 | 59 | * @property integer $approved The time of approval of the object, or 0 if not approved. Set automatically through approve/unapprove. |
| 60 | 60 | * @property string $approver The person that approved/unapproved the object. Set automatically through approve/unapprove. |
| 61 | - |
|
| 62 | 61 | * @package midcom.helper |
| 63 | 62 | */ |
| 64 | 63 | class midcom_helper_metadata |